DATACMNS-402 - Add support for sorting by a QueryDSL OrderSpecifier.

Previously we did only support ordering by a string or property path through Sort. In order to be able to express more type safe ordering expressions we introduce QSort as a subclass of Sort that is able to wrap QueryDSL OrderSpecifiers. To be able to separate the concerns of sorting via QueryDSL expressions better we introduce the AbstractPageRequest base class and QPageRequest as a special implementation that accepts a QSort or OrderSpecifiers for ordering.

Original pull request: #59.

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.domain;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.data.domain.UnitTestUtils.*;
+
+import org.junit.Test;
+
+/**
+ * @author Thomas Darimont
+ */
+public abstract class AbstractPageRequestUnitTests {
+
+	public abstract AbstractPageRequest newPageRequest(int page, int size);
+
+	@Test(expected = IllegalArgumentException.class)
+	public void preventsNegativePage() {
+		newPageRequest(-1, 10);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void preventsNegativeSize() {
+		newPageRequest(0, -1);
+	}
+
+	@Test
+	public void navigatesPageablesCorrectly() {
+
+		Pageable request = newPageRequest(1, 10);
+
+		assertThat(request.hasPrevious(), is(true));
+		assertThat(request.next(), is((Pageable) newPageRequest(2, 10)));
+
+		Pageable first = request.previousOrFirst();
+
+		assertThat(first.hasPrevious(), is(false));
+		assertThat(first, is((Pageable) newPageRequest(0, 10)));
+		assertThat(first, is(request.first()));
+		assertThat(first.previousOrFirst(), is(first));
+	}
+
+	@Test
+	public void equalsHonoursPageAndSize() {
+
+		AbstractPageRequest request = newPageRequest(0, 10);
+
+		// Equals itself
+		assertEqualsAndHashcode(request, request);
+
+		// Equals same setup
+		assertEqualsAndHashcode(request, newPageRequest(0, 10));
+
+		// Does not equal on different page
+		assertNotEqualsAndHashcode(request, newPageRequest(1, 10));
+
+		// Does not equal on different size
+		assertNotEqualsAndHashcode(request, newPageRequest(0, 11));
+	}
+
+	/**
+	 * @see DATACMNS-377
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void preventsPageSizeLessThanOne() {
+		newPageRequest(0, 0);
+	}
+}

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

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.domain;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
 import static org.springframework.data.domain.UnitTestUtils.*;
 
 import org.junit.Test;
@@ -27,39 +25,26 @@ import org.springframework.data.domain.Sort.Direction;
  * 
  * @author Oliver Gierke
  */
-public class PageRequestUnitTests {
+public class PageRequestUnitTests extends AbstractPageRequestUnitTests {
 
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNegativePage() {
-		new PageRequest(-1, 10);
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.domain.AbstractPageRequestUnitTests#newPageRequest(int, int)
+	 */
+	@Override
+	public AbstractPageRequest newPageRequest(int page, int size) {
+		return this.newPageRequest(page, size, null);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsNegativeSize() {
-		new PageRequest(0, -1);
-	}
-
-	@Test
-	public void navigatesPageablesCorrectly() {
-
-		Pageable request = new PageRequest(1, 10);
-
-		assertThat(request.hasPrevious(), is(true));
-		assertThat(request.next(), is((Pageable) new PageRequest(2, 10)));
-
-		Pageable first = request.previousOrFirst();
-
-		assertThat(first.hasPrevious(), is(false));
-		assertThat(first, is((Pageable) new PageRequest(0, 10)));
-		assertThat(first, is(request.first()));
-		assertThat(first.previousOrFirst(), is(first));
+	public AbstractPageRequest newPageRequest(int page, int size, Sort sort) {
+		return new PageRequest(page, size, sort);
 	}
 
 	@Test
 	public void equalsRegardsSortCorrectly() {
 
 		Sort sort = new Sort(Direction.DESC, "foo");
-		PageRequest request = new PageRequest(0, 10, sort);
+		AbstractPageRequest request = new PageRequest(0, 10, sort);
 
 		// Equals itself
 		assertEqualsAndHashcode(request, request);
@@ -76,30 +61,4 @@ public class PageRequestUnitTests {
 		// Is not equal to instance with another sort
 		assertNotEqualsAndHashcode(request, new PageRequest(0, 10, Direction.ASC, "foo"));
 	}
-
-	@Test
-	public void equalsHonoursPageAndSize() {
-
-		PageRequest request = new PageRequest(0, 10);
-
-		// Equals itself
-		assertEqualsAndHashcode(request, request);
-
-		// Equals same setup
-		assertEqualsAndHashcode(request, new PageRequest(0, 10));
-
-		// Does not equal on different page
-		assertNotEqualsAndHashcode(request, new PageRequest(1, 10));
-
-		// Does not equal on different size
-		assertNotEqualsAndHashcode(request, new PageRequest(0, 11));
-	}
-
-	/**
-	 * @see DATACMNS-377
-	 */
-	@Test(expected = IllegalArgumentException.class)
-	public void preventsPageSizeLessThanOne() {
-		new PageRequest(0, 0);
-	}
 }