Verify custom finders can handle PageRequest as method parameter.

Spring Data Commons patched handling subclasses of special parameter types through spring-projects/spring-data-commons#2626. This commit adds test cases ensuring things work properly with Spring Data JPA.

See spring-projects#2013.

Author: gregturn

src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

@@ -27,6 +27,7 @@
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -1679,6 +1680,32 @@ void findByEmptyCollectionOfIntegers() throws Exception {
 		assertThat(users).hasSize(0);
 	}
 
+	@Test // GH-2013
+	void findByCollectionWithPageable() {
+
+		flushTestUsers();
+
+		Page<User> userPage = repository.findByAgeIn(Arrays.asList(28, 35), (Pageable) PageRequest.of(0, 2));
+
+		assertThat(userPage).hasSize(2);
+		assertThat(userPage.getTotalElements()).isEqualTo(2);
+		assertThat(userPage.getTotalPages()).isEqualTo(1);
+		assertThat(userPage.getContent()).containsExactlyInAnyOrder(firstUser, secondUser);
+	}
+
+	@Test // GH-2013
+	void findByCollectionWithPageRequest() {
+
+		flushTestUsers();
+
+		Page<User> userPage = repository.findByAgeIn(Arrays.asList(28, 35), (PageRequest) PageRequest.of(0, 2));
+
+		assertThat(userPage).hasSize(2);
+		assertThat(userPage.getTotalElements()).isEqualTo(2);
+		assertThat(userPage.getTotalPages()).isEqualTo(1);
+		assertThat(userPage.getContent()).containsExactlyInAnyOrder(firstUser, secondUser);
+	}
+
 	@Test // DATAJPA-606
 	void findByEmptyArrayOfIntegers() throws Exception {
 

src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

@@ -27,6 +27,7 @@
 import javax.persistence.QueryHint;
 
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
@@ -52,6 +53,7 @@
  * @author Jeff Sheets
  * @author Andrey Kovalev
  * @author JyotirmoyVS
+ * @author Greg Turnquist
  */
 public interface UserRepository
 		extends JpaRepository<User, Integer>, JpaSpecificationExecutor<User>, UserRepositoryCustom {
@@ -504,6 +506,12 @@ List<User> findUsersByFirstnameForSpELExpressionWithParameterIndexOnlyWithEntity
 	// DATAJPA-606
 	List<User> findByAgeIn(Collection<Integer> ages);
 
+	// GH-2013
+	Page<User> findByAgeIn(Collection<Integer> ages, Pageable pageable);
+
+	// GH-2013
+	Page<User> findByAgeIn(Collection<Integer> ages, PageRequest pageable);
+
 	// DATAJPA-606
 	List<User> queryByAgeIn(Integer[] ages);