JD-452 fix checkstyle + up spring core

This commit is contained in:
ggmaleva 2021-07-20 10:13:00 +03:00
parent db26371f90
commit da0d5fef49
No known key found for this signature in database
GPG Key ID: 0E412B78565B108F
2 changed files with 9 additions and 3 deletions

View File

@ -70,6 +70,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!-- remove when release spring parent with spring.security up 5.5.0-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.3.8</version>
</dependency>
<!-- logback -->
<dependency>

View File

@ -16,13 +16,13 @@ public class FilterConverter {
public FilterDto convert(Filter filter, Page page) {
FilterDto filterDto = new FilterDto();
Map<PaymentField, String> searchPatterns = assembleSearchPatterns(filter);
filterDto.setSearchPatterns(searchPatterns);
filterDto.setLastId(page.getContinuationId());
filterDto.setSize(page.getSize());
if (filter.isSetInterval()) {
filterDto.setTimeFrom(filter.getInterval().getLowerBound().getBoundTime());
filterDto.setTimeTo(filter.getInterval().getUpperBound().getBoundTime());
}
filterDto.setLastId(page.getContinuationId());
filterDto.setSize(page.getSize());
filterDto.setSearchPatterns(searchPatterns);
return filterDto;
}