Polishing.

Introduce factory methods on Pageable, PageRequest, and QPageRequest to construct PageRequest objects. Replace builder with with…(…) methods.

Closes #322.

src/test/java/org/springframework/data/domain/AbstractPageRequestUnitTests.java

@@ -49,7 +49,7 @@ public abstract class AbstractPageRequestUnitTests {
 		Pageable first = request.previousOrFirst();
 
 		assertThat(first.hasPrevious()).isFalse();
-		assertThat(first).isEqualTo((Pageable) newPageRequest(0, 10));
+		assertThat(first).isEqualTo(newPageRequest(0, 10));
 		assertThat(first).isEqualTo(request.first());
 		assertThat(first.previousOrFirst()).isEqualTo(first);
 	}

src/test/java/org/springframework/data/domain/PageRequestUnitTests.java

@@ -16,16 +16,18 @@
 package org.springframework.data.domain;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.springframework.data.domain.PageRequest.pageRequest;
 import static org.springframework.data.domain.UnitTestUtils.*;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.domain.Sort.Direction;
 
 /**
  * Unit test for {@link PageRequest}.
  *
  * @author Oliver Gierke
+ * @author Anastasiia Smirnova
+ * @author Mark Paluch
  */
 class PageRequestUnitTests extends AbstractPageRequestUnitTests {
 
@@ -38,30 +40,29 @@ class PageRequestUnitTests extends AbstractPageRequestUnitTests {
 		return PageRequest.of(page, size);
 	}
 
-	AbstractPageRequest newPageRequest(int page, int size, Sort sort) {
-		return PageRequest.of(page, size, sort);
-	}
-
 	@Test
 	void equalsRegardsSortCorrectly() {
 
 		Sort sort = Sort.by(Direction.DESC, "foo");
-		AbstractPageRequest request = pageRequest().page(0).size(10).sort(sort).build();
+		AbstractPageRequest request = PageRequest.ofSize(10).withPage(1).withSort(sort);
 
 		// Equals itself
 		assertEqualsAndHashcode(request, request);
 
 		// Equals another instance with same setup
-		assertEqualsAndHashcode(request, PageRequest.of(0, 10, sort));
+		assertEqualsAndHashcode(request, PageRequest.of(1, 10, sort));
+
+		// Equals another instance with same sort by properties
+		assertEqualsAndHashcode(request, PageRequest.ofSize(10).withPage(1).withSort(Direction.DESC, "foo"));
 
 		// Equals without sort entirely
 		assertEqualsAndHashcode(PageRequest.of(0, 10), PageRequest.of(0, 10));
 
 		// Is not equal to instance without sort
-		assertNotEqualsAndHashcode(request, PageRequest.of(0, 10));
+		assertNotEqualsAndHashcode(request, PageRequest.of(1, 10));
 
 		// Is not equal to instance with another sort
-		assertNotEqualsAndHashcode(request, PageRequest.of(0, 10, Direction.ASC, "foo"));
+		assertNotEqualsAndHashcode(request, PageRequest.of(1, 10, Direction.ASC, "foo"));
 	}
 
 	@Test // DATACMNS-1581

src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java

@@ -23,7 +23,10 @@ import org.springframework.data.domain.AbstractPageRequest;
 import org.springframework.data.domain.AbstractPageRequestUnitTests;
 
 /**
+ * Unit tests for {@link QPageRequest}.
+ *
  * @author Thomas Darimont
+ * @author Mark Paluch
  */
 public class QPageRequestUnitTests extends AbstractPageRequestUnitTests {
 
@@ -49,7 +52,7 @@ public class QPageRequestUnitTests extends AbstractPageRequestUnitTests {
 	void constructsQPageRequestWithQSort() {
 
 		QUser user = QUser.user;
-		QPageRequest pageRequest = QPageRequest.of(0, 10, QSort.by(user.firstname.asc()));
+		QPageRequest pageRequest = QPageRequest.ofSize(10).withSort(QSort.by(user.firstname.asc()));
 
 		assertThat(pageRequest.getSort()).isEqualTo(QSort.by(user.firstname.asc()));
 	}