Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Michael Minella
2017-11-27 18:01:26 -06:00
parent 6d88d1f3d2
commit 6e0df991b6
2 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java
View File

@@ -188,11 +188,11 @@ public class MongoItemReader<T> extends AbstractPaginatedDataItemReader<T> imple
@SuppressWarnings("unchecked")
protected Iterator<T> doPageRead() {
if (queryString != null) {
Pageable pageRequest = new PageRequest(page, pageSize, sort);
Pageable pageRequest = PageRequest.of(page, pageSize, sort);
String populatedQuery = replacePlaceholders(queryString, parameterValues);
Query mongoQuery = null;
Query mongoQuery;
if(StringUtils.hasText(fields)) {
mongoQuery = new BasicQuery(populatedQuery, fields);
@@ -214,7 +214,7 @@ public class MongoItemReader<T> extends AbstractPaginatedDataItemReader<T> imple
}
} else {
Pageable pageRequest = new PageRequest(page, pageSize);
Pageable pageRequest = PageRequest.of(page, pageSize);
query.with(pageRequest);
if(StringUtils.hasText(collection)) {
@@ -239,10 +239,7 @@ public class MongoItemReader<T> extends AbstractPaginatedDataItemReader<T> imple
if (queryString != null) {
Assert.state(sort != null, "A sort is required.");
}
if (query != null) {
Assert.state(query.getSortObject() != null, "A Sort in Query object is required.");
}
if (query != null && query.getLimit() != 0) {
log.warn("PageSize in Query object was ignored. Please set it by MongoItemReader.setPageSize().");
}