diff --git a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java index 137c2578a..08c6e1fa3 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java @@ -167,7 +167,7 @@ public class PartTreeJpaQuery extends AbstractJpaQuery { private Sort getDynamicSort(Object[] values) { - return parameters.hasSortParameter() ? new ParametersParameterAccessor( + return parameters.potentiallySortsDynamically() ? new ParametersParameterAccessor( parameters, values).getSort() : null; } } diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java index f9373fb73..532da5bb6 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java @@ -27,6 +27,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; import org.springframework.data.jpa.domain.sample.User; import org.springframework.data.jpa.repository.sample.UserRepository; import org.springframework.data.repository.query.QueryLookupStrategy; @@ -155,4 +157,26 @@ public class UserRepositoryFinderTests { assertThat(result.size(), is(1)); assertThat(result.get(0), is(oliver)); } + + + @Test + public void respectsPageableOrderOnQueryGenerateFromMethodName() + throws Exception { + + Page ascending = + userRepository.findByLastnameLike(new PageRequest(0, 10, + new Sort(Direction.ASC, "firstname")), "Matthews"); + Page descending = + userRepository.findByLastnameLike(new PageRequest(0, 10, + new Sort(Direction.DESC, "firstname")), "Matthews"); + assertThat(ascending.getTotalElements(), is(2L)); + assertThat(descending.getTotalElements(), is(2L)); + assertThat(ascending.getContent().get(0).getFirstname(), + is(not(equalTo(descending.getContent().get(0).getFirstname())))); + assertThat(ascending.getContent().get(0).getFirstname(), + is(equalTo(descending.getContent().get(1).getFirstname()))); + assertThat(ascending.getContent().get(1).getFirstname(), + is(equalTo(descending.getContent().get(0).getFirstname()))); + } + } diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java index 15533b8a4..49debcd2e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java +++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java @@ -215,4 +215,7 @@ public interface UserRepository extends JpaRepository, List findBySpringDataNamedQuery(String lastname); + + + Page findByLastnameLike(Pageable pageable, String lastname); }