Apply sort of unpaged Pageable to query.

Original pull request: #4773 Closes #4771
spring-projects · Sep 12, 2024 · a960ae1 · a960ae1
1 parent 156197c
commit a960ae1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -272,6 +272,9 @@ public Query withHint(Document hint) {
 	public Query with(Pageable pageable) {
 
 		if (pageable.isUnpaged()) {
+			if(pageable.getSort().isSorted()) {
+				return with(pageable.getSort());
+			}
 			return this;
 		}
 

diff --git a/...ng-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java b/...ng-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
@@ -366,6 +367,15 @@ void queryOfShouldWorkOnProxiedObjects() {
 		compareQueries(target, source);
 	}
 
+	@Test // GH-4771
+	void appliesSortOfUnpagedPageable() {
+
+		Query query = new Query();
+		query.with(Pageable.unpaged(Sort.by("sortMe")));
+
+		assertThat(query.isSorted()).isTrue();
+	}
+
 	private void compareQueries(Query actual, Query expected) {
 
 		assertThat(actual.getCollation()).isEqualTo(expected.getCollation());