Polish

Author: mminella

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

@@ -188,11 +188,11 @@ public void setHint(String hint) {
 	@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 @@ protected Iterator<T> doPageRead() {
 			}
 
 		} 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 void afterPropertiesSet() throws Exception {
 		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().");
 		}

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java

@@ -63,7 +63,7 @@ public void setUp() throws Exception {
 
 	@Test
 	public void testAfterPropertiesSetForQueryString() throws Exception{
-		reader = new MongoItemReader<String>();
+		reader = new MongoItemReader<>();
 
 		try {
 			reader.afterPropertiesSet();
@@ -114,26 +114,14 @@ public void testAfterPropertiesSetForQueryString() throws Exception{
 
 	@Test
 	public void testAfterPropertiesSetForQueryObject() throws Exception{
-		reader = new MongoItemReader<String>();
+		reader = new MongoItemReader<>();
 
 		reader.setTemplate(template);
 		reader.setTargetType(String.class);
 
-		Query query1 = new Query();
+		Query query1 = new Query().with(Sort.by(new Order(Sort.Direction.ASC, "_id")));
 		reader.setQuery(query1);
 
-		try {
-			reader.afterPropertiesSet();
-			fail("Sort was not set but exception was not thrown.");
-		} catch (IllegalStateException iae) {
-			assertEquals("A Sort in Query object is required.", iae.getMessage());
-		} catch (Throwable t) {
-			fail("Wrong exception was thrown.");
-		}
-
-		Query query2 = new Query().with(new Sort(new Order(Sort.Direction.ASC, "_id")));
-		reader.setQuery(query2);
-
 		reader.afterPropertiesSet();
 	}
 
@@ -253,18 +241,18 @@ public void testQueryWithCollection() {
 
 	@Test
 	public void testQueryObject() throws Exception {
-		reader = new MongoItemReader<String>();
+		reader = new MongoItemReader<>();
 		reader.setTemplate(template);
 
 		Query query = new Query()
-				.with(new Sort(new Order(Sort.Direction.ASC, "_id")));
+				.with(Sort.by(new Order(Sort.Direction.ASC, "_id")));
 		reader.setQuery(query);
 		reader.setTargetType(String.class);
 
 		reader.afterPropertiesSet();
 
 		ArgumentCaptor<Query> queryContainer = ArgumentCaptor.forClass(Query.class);
-		when(template.find(queryContainer.capture(), eq(String.class))).thenReturn(new ArrayList<String>());
+		when(template.find(queryContainer.capture(), eq(String.class))).thenReturn(new ArrayList<>());
 
 		assertFalse(reader.doPageRead().hasNext());
 
@@ -276,19 +264,19 @@ public void testQueryObject() throws Exception {
 
 	@Test
 	public void testQueryObjectWithIgnoredPageSize() throws Exception {
-		reader = new MongoItemReader<String>();
+		reader = new MongoItemReader<>();
 		reader.setTemplate(template);
 
 		Query query = new Query()
-				.with(new Sort(new Order(Sort.Direction.ASC, "_id")))
-				.with(new PageRequest(0, 50));
+				.with(Sort.by(new Order(Sort.Direction.ASC, "_id")))
+				.with(PageRequest.of(0, 50));
 		reader.setQuery(query);
 		reader.setTargetType(String.class);
 
 		reader.afterPropertiesSet();
 
 		ArgumentCaptor<Query> queryContainer = ArgumentCaptor.forClass(Query.class);
-		when(template.find(queryContainer.capture(), eq(String.class))).thenReturn(new ArrayList<String>());
+		when(template.find(queryContainer.capture(), eq(String.class))).thenReturn(new ArrayList<>());
 
 		assertFalse(reader.doPageRead().hasNext());
 
@@ -300,20 +288,20 @@ public void testQueryObjectWithIgnoredPageSize() throws Exception {
 
 	@Test
 	public void testQueryObjectWithPageSize() throws Exception {
-		reader = new MongoItemReader<String>();
+		reader = new MongoItemReader<>();
 		reader.setTemplate(template);
 
 		Query query = new Query()
-				.with(new Sort(new Order(Sort.Direction.ASC, "_id")))
-				.with(new PageRequest(30, 50));
+				.with(Sort.by(new Order(Sort.Direction.ASC, "_id")))
+				.with(PageRequest.of(30, 50));
 		reader.setQuery(query);
 		reader.setTargetType(String.class);
 		reader.setPageSize(100);
 
 		reader.afterPropertiesSet();
 
 		ArgumentCaptor<Query> queryContainer = ArgumentCaptor.forClass(Query.class);
-		when(template.find(queryContainer.capture(), eq(String.class))).thenReturn(new ArrayList<String>());
+		when(template.find(queryContainer.capture(), eq(String.class))).thenReturn(new ArrayList<>());
 
 		assertFalse(reader.doPageRead().hasNext());
 
@@ -325,11 +313,11 @@ public void testQueryObjectWithPageSize() throws Exception {
 
 	@Test
 	public void testQueryObjectWithCollection() throws Exception {
-		reader = new MongoItemReader<String>();
+		reader = new MongoItemReader<>();
 		reader.setTemplate(template);
 
 		Query query = new Query()
-				.with(new Sort(new Order(Sort.Direction.ASC, "_id")));
+				.with(Sort.by(new Order(Sort.Direction.ASC, "_id")));
 		reader.setQuery(query);
 		reader.setTargetType(String.class);
 		reader.setCollection("collection");
@@ -338,7 +326,7 @@ public void testQueryObjectWithCollection() throws Exception {
 
 		ArgumentCaptor<Query> queryContainer = ArgumentCaptor.forClass(Query.class);
 		ArgumentCaptor<String> stringContainer = ArgumentCaptor.forClass(String.class);
-		when(template.find(queryContainer.capture(), eq(String.class), stringContainer.capture())).thenReturn(new ArrayList<String>());
+		when(template.find(queryContainer.capture(), eq(String.class), stringContainer.capture())).thenReturn(new ArrayList<>());
 
 		assertFalse(reader.doPageRead().hasNext());