DATAMONGO-1668 - Polishing.

Replace new Sort(…) with Sort.by(…) and new PageRequest(…) with PageRequest.of(…).

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java

@@ -348,7 +348,7 @@ public static SortOperation sort(Sort sort) {
 	 * @return
 	 */
 	public static SortOperation sort(Direction direction, String... fields) {
-		return new SortOperation(new Sort(direction, fields));
+		return new SortOperation(Sort.by(direction, fields));
 	}
 
 	/**
@@ -585,7 +585,7 @@ public Document toDocument(String inputCollectionName, AggregationOperationConte
 		return command;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java

@@ -31,6 +31,7 @@
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 1.3
  * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/sort/">MongoDB Aggregation Framework: $sort</a>
  */
@@ -40,7 +41,7 @@ public class SortOperation implements AggregationOperation {
 
 	/**
 	 * Creates a new {@link SortOperation} for the given {@link Sort} instance.
-	 * 
+	 *
 	 * @param sort must not be {@literal null}.
 	 */
 	public SortOperation(Sort sort) {
@@ -50,14 +51,14 @@ public SortOperation(Sort sort) {
 	}
 
 	public SortOperation and(Direction direction, String... fields) {
-		return and(new Sort(direction, fields));
+		return and(Sort.by(direction, fields));
 	}
 
 	public SortOperation and(Sort sort) {
 		return new SortOperation(this.sort.and(sort));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 	 */

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java

@@ -57,7 +57,6 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
@@ -1122,7 +1121,7 @@ public void testFindOneWithSort() {
 
 		// test query with a sort
 		Query q2 = new Query(Criteria.where("age").gt(10));
-		q2.with(new Sort(Direction.DESC, "age"));
+		q2.with(Sort.by(Direction.DESC, "age"));
 		PersonWithAList p5 = template.findOne(q2, PersonWithAList.class);
 		assertThat(p5.getFirstName(), is("Mark"));
 	}
@@ -2064,8 +2063,8 @@ public void itShouldBePossibleToReuseAnExistingQuery() {
 
 		assertThat(template.count(query, Sample.class), is(1L));
 
-		query.with(new PageRequest(0, 10));
-		query.with(new Sort("field"));
+		query.with(PageRequest.of(0, 10));
+		query.with(Sort.by("field"));
 
 		assertThat(template.find(query, Sample.class), is(not(empty())));
 	}
@@ -2696,7 +2695,7 @@ public void sortOnIdFieldPropertyShouldBeMappedCorrectly() {
 		template.save(one);
 		template.save(two);
 
-		Query query = query(where("_id").in("1", "2")).with(new Sort(Direction.DESC, "someIdKey"));
+		Query query = query(where("_id").in("1", "2")).with(Sort.by(Direction.DESC, "someIdKey"));
 		assertThat(template.find(query, DoucmentWithNamedIdField.class), contains(two, one));
 	}
 
@@ -2714,7 +2713,7 @@ public void sortOnAnnotatedFieldPropertyShouldBeMappedCorrectly() {
 		template.save(one);
 		template.save(two);
 
-		Query query = query(where("_id").in("1", "2")).with(new Sort(Direction.DESC, "value"));
+		Query query = query(where("_id").in("1", "2")).with(Sort.by(Direction.DESC, "value"));
 		assertThat(template.find(query, DoucmentWithNamedIdField.class), contains(two, one));
 	}
 
@@ -2819,7 +2818,7 @@ public void takesSortIntoAccountWhenStreaming() {
 		template.insertAll(Arrays.asList(oldestPerson, youngestPerson));
 
 		Query q = new Query();
-		q.with(new Sort(Direction.ASC, "age"));
+		q.with(Sort.by(Direction.ASC, "age"));
 		CloseableIterator<Person> stream = template.stream(q, Person.class);
 
 		assertThat(stream.next().getAge(), is(youngestPerson.getAge()));
@@ -2835,7 +2834,7 @@ public void takesLimitIntoAccountWhenStreaming() {
 		template.insertAll(Arrays.asList(oldestPerson, youngestPerson));
 
 		Query q = new Query();
-		q.with(new PageRequest(0, 1, new Sort(Direction.ASC, "age")));
+		q.with(PageRequest.of(0, 1, Sort.by(Direction.ASC, "age")));
 		CloseableIterator<Person> stream = template.stream(q, Person.class);
 
 		assertThat(stream.next().getAge(), is(youngestPerson.getAge()));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java

@@ -87,6 +87,7 @@
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
@@ -321,7 +322,7 @@ public void findAllAndRemoveShouldNotTriggerRemoveIfFindResultIsEmpty() {
 	@Test // DATAMONGO-948
 	public void sortShouldBeTakenAsIsWhenExecutingQueryWithoutSpecificTypeInformation() {
 
-		Query query = Query.query(Criteria.where("foo").is("bar")).with(new Sort("foo"));
+		Query query = Query.query(Criteria.where("foo").is("bar")).with(Sort.by("foo"));
 		template.executeQuery(query, "collection1", new DocumentCallbackHandler() {
 
 			@Override

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortOperationUnitTests.java

@@ -26,15 +26,16 @@
 
 /**
  * Unit tests for {@link SortOperation}.
- * 
+ *
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class SortOperationUnitTests {
 
 	@Test
 	public void createsDocumentForAscendingSortCorrectly() {
 
-		SortOperation operation = new SortOperation(new Sort(Direction.ASC, "foobar"));
+		SortOperation operation = new SortOperation(Sort.by(Direction.ASC, "foobar"));
 		Document result = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		Document sortValue = getAsDocument(result, "$sort");
@@ -45,7 +46,7 @@ public void createsDocumentForAscendingSortCorrectly() {
 	@Test
 	public void createsDocumentForDescendingSortCorrectly() {
 
-		SortOperation operation = new SortOperation(new Sort(Direction.DESC, "foobar"));
+		SortOperation operation = new SortOperation(Sort.by(Direction.DESC, "foobar"));
 		Document result = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		Document sortValue = getAsDocument(result, "$sort");

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java

@@ -64,7 +64,7 @@
 
 /**
  * Unit tests for {@link QueryMapper}.
- * 
+ *
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Thomas Darimont
@@ -565,7 +565,7 @@ public void shouldMapQueryForNestedCustomizedPropertiesUsingConfiguredFieldNames
 	@Test // DATAMONGO-647
 	public void customizedFieldNameShouldBeMappedCorrectlyWhenApplyingSort() {
 
-		Query query = query(where("field").is("bar")).with(new Sort(Direction.DESC, "field"));
+		Query query = query(where("field").is("bar")).with(Sort.by(Direction.DESC, "field"));
 		org.bson.Document document = mapper.getMappedObject(query.getSortObject(),
 				context.getPersistentEntity(CustomizedField.class));
 		assertThat(document, equalTo(new org.bson.Document().append("foo", -1)));
@@ -597,7 +597,7 @@ public void getMappedFieldsReplacesTextScoreFieldProperlyCorrectlyWhenPresent()
 	@Test // DATAMONGO-973
 	public void getMappedSortAppendsTextScoreProperlyWhenSortedByScore() {
 
-		Query query = new Query().with(new Sort("textScore"));
+		Query query = new Query().with(Sort.by("textScore"));
 
 		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
 				context.getPersistentEntity(WithTextScoreProperty.class));
@@ -608,7 +608,7 @@ public void getMappedSortAppendsTextScoreProperlyWhenSortedByScore() {
 	@Test // DATAMONGO-973
 	public void getMappedSortIgnoresTextScoreWhenNotSortedByScore() {
 
-		Query query = new Query().with(new Sort("id"));
+		Query query = new Query().with(Sort.by("id"));
 
 		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
 				context.getPersistentEntity(WithTextScoreProperty.class));
@@ -643,7 +643,7 @@ public void shouldUseExplicitlySetFieldnameForIdPropertyCandidates() {
 	@Test // DATAMONGO-1050
 	public void shouldUseExplicitlySetFieldnameForIdPropertyCandidatesUsedInSortClause() {
 
-		Query query = new Query().with(new Sort("nested.id"));
+		Query query = new Query().with(Sort.by("nested.id"));
 
 		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
 				context.getPersistentEntity(RootForClassWithExplicitlyRenamedIdField.class));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java

@@ -379,7 +379,7 @@ public void updatePushEachWithValueSortShouldRenderCorrectly() {
 	public void updatePushEachWithDocumentSortShouldRenderCorrectly() {
 
 		Update update = new Update().push("list")
-				.sort(new Sort(new Order(Direction.ASC, "value"), new Order(Direction.ASC, "field")))
+				.sort(Sort.by(new Order(Direction.ASC, "value"), new Order(Direction.ASC, "field")))
 				.each(Collections.emptyList());
 
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -397,7 +397,7 @@ public void updatePushEachWithDocumentSortShouldRenderCorrectly() {
 	public void updatePushEachWithSortShouldRenderCorrectlyWhenUsingMultiplePush() {
 
 		Update update = new Update().push("authors").sort(Direction.ASC).each("Harry").push("chapters")
-				.sort(new Sort(Direction.ASC, "order")).each(Collections.emptyList());
+				.sort(Sort.by(Direction.ASC, "order")).each(Collections.emptyList());
 
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Object.class));
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java

@@ -51,6 +51,7 @@
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Mark Paluch
  */
 public class MappingTests extends AbstractIntegrationTests {
 
@@ -427,7 +428,7 @@ public void testNoMappingAnnotationsUsingStringAsId() {
 		template.insert(p4);
 
 		Query q = query(where("id").in("1", "2"));
-		q.with(new Sort(Direction.ASC, "id"));
+		q.with(Sort.by(Direction.ASC, "id"));
 		List<PersonPojoStringId> people = template.find(q, PersonPojoStringId.class);
 		assertEquals(2, people.size());
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/NearQueryUnitTests.java

@@ -29,10 +29,11 @@
 
 /**
  * Unit tests for {@link NearQuery}.
- * 
+ *
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class NearQueryUnitTests {
 
@@ -86,7 +87,7 @@ public void configuresResultMetricCorrectly() {
 	@Test // DATAMONGO-445
 	public void shouldTakeSkipAndLimitSettingsFromGivenPageable() {
 
-		Pageable pageable = new PageRequest(3, 5);
+		Pageable pageable = PageRequest.of(3, 5);
 		NearQuery query = NearQuery.near(new Point(1, 1)).with(pageable);
 
 		assertThat(query.getSkip(), is((long)pageable.getPageNumber() * pageable.getPageSize()));
@@ -110,7 +111,7 @@ public void shouldTakeSkipAndLimitSettingsFromPageableEvenIfItWasSpecifiedOnQuer
 
 		int limit = 10;
 		int skip = 5;
-		Pageable pageable = new PageRequest(3, 5);
+		Pageable pageable = PageRequest.of(3, 5);
 		NearQuery query = NearQuery.near(new Point(1, 1))
 				.query(Query.query(Criteria.where("foo").is("bar")).limit(limit).skip(skip)).with(pageable);
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java

@@ -40,6 +40,7 @@
  * @author Patryk Wasik
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class QueryTests {
 
@@ -190,7 +191,7 @@ public void testQueryWithRegexAndOption() {
 	@Test // DATAMONGO-538
 	public void addsSortCorrectly() {
 
-		Query query = new Query().with(new Sort(Direction.DESC, "foo"));
+		Query query = new Query().with(Sort.by(Direction.DESC, "foo"));
 		assertThat(query.getSortObject(), is(Document.parse("{ \"foo\" : -1}")));
 	}
 
@@ -200,7 +201,7 @@ public void rejectsOrderWithIgnoreCase() {
 		exception.expect(IllegalArgumentException.class);
 		exception.expectMessage("foo");
 
-		new Query().with(new Sort(new Sort.Order("foo").ignoreCase()));
+		new Query().with(Sort.by(new Sort.Order("foo").ignoreCase()));
 	}
 
 	@Test // DATAMONGO-709

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/SortTests.java

@@ -25,27 +25,30 @@
 
 /**
  * Unit tests for sorting.
- * 
+ *
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class SortTests {
 
 	@Test
 	public void testWithSortAscending() {
-		Query s = new Query().with(new Sort(Direction.ASC, "name"));
+
+		Query s = new Query().with(Sort.by(Direction.ASC, "name"));
 		assertEquals(Document.parse("{ \"name\" : 1}"), s.getSortObject());
 	}
 
 	@Test
 	public void testWithSortDescending() {
-		Query s = new Query().with(new Sort(Direction.DESC, "name"));
+
+		Query s = new Query().with(Sort.by(Direction.DESC, "name"));
 		assertEquals(Document.parse("{ \"name\" : -1}"), s.getSortObject());
 	}
 
 	@Test // DATADOC-177
 	public void preservesOrderKeysOnMultipleSorts() {
 
-		Query sort = new Query().with(new Sort(Direction.DESC, "foo").and(new Sort(Direction.DESC, "bar")));
+		Query sort = new Query().with(Sort.by(Direction.DESC, "foo").and(Sort.by(Direction.DESC, "bar")));
 		assertThat(sort.getSortObject(), is(Document.parse("{ \"foo\" : -1 , \"bar\" : -1}")));
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java

@@ -47,6 +47,7 @@
 
 /**
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class TextQueryTests extends AbstractIntegrationTests {
 
@@ -207,12 +208,12 @@ public void shouldApplyPaginationCorrectly() {
 
 		// page 1
 		List<FullTextDoc> result = template
-				.find(new TextQuery("bake coffee cake").sortByScore().with(new PageRequest(0, 2)), FullTextDoc.class);
+				.find(new TextQuery("bake coffee cake").sortByScore().with(PageRequest.of(0, 2)), FullTextDoc.class);
 		assertThat(result, hasSize(2));
 		assertThat(result, contains(BAKE, COFFEE));
 
 		// page 2
-		result = template.find(new TextQuery("bake coffee cake").sortByScore().with(new PageRequest(1, 2)),
+		result = template.find(new TextQuery("bake coffee cake").sortByScore().with(PageRequest.of(1, 2)),
 				FullTextDoc.class);
 		assertThat(result, hasSize(1));
 		assertThat(result, contains(CAKE));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryUnitTests.java

@@ -24,8 +24,9 @@
 
 /**
  * Unit tests for {@link TextQuery}.
- * 
+ *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public class TextQueryUnitTests {
 
@@ -65,7 +66,7 @@ public void shouldIncludeSortingByScoreCorrectly() {
 	public void shouldNotOverrideExistingSort() {
 
 		TextQuery query = new TextQuery(QUERY);
-		query.with(new Sort(Direction.DESC, "foo"));
+		query.with(Sort.by(Direction.DESC, "foo"));
 		query.sortByScore();
 
 		assertThat(query,

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIntegrationTests.java

@@ -45,7 +45,7 @@
 
 /**
  * Integration tests for {@link GridFsTemplate}.
- * 
+ *
  * @author Oliver Gierke
  * @author Philipp Schneider
  * @author Thomas Darimont
@@ -151,7 +151,7 @@ public void considersSortWhenQueryingFiles() throws IOException {
 		ObjectId third = operations.store(resource.getInputStream(), "foobar.xml");
 		ObjectId first = operations.store(resource.getInputStream(), "bar.xml");
 
-		Query query = new Query().with(new Sort(Direction.ASC, "filename"));
+		Query query = new Query().with(Sort.by(Direction.ASC, "filename"));
 
 		List<com.mongodb.client.gridfs.model.GridFSFile> files = new ArrayList<com.mongodb.client.gridfs.model.GridFSFile>();
 		GridFSFindIterable result = operations.find(query);