Add support for Limit.

Closes #3052

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaParameters.java

@@ -15,12 +15,12 @@
  */
 package org.springframework.data.jpa.repository.query;
 
+import jakarta.persistence.TemporalType;
+
 import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.List;
 
-import jakarta.persistence.TemporalType;
-
 import org.springframework.core.MethodParameter;
 import org.springframework.data.jpa.repository.Temporal;
 import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
@@ -60,6 +60,13 @@ protected JpaParameters createFrom(List<JpaParameter> parameters) {
 		return new JpaParameters(parameters);
 	}
 
+	/**
+	 * @return {@code true} if the method signature declares Limit or Pageable parameters.
+	 */
+	public boolean hasLimitingParameters() {
+		return hasLimitParameter() || hasPageableParameter();
+	}
+
 	/**
 	 * Custom {@link Parameter} implementation adding parameters of type {@link Temporal} to the special ones.
 	 *

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java

@@ -79,7 +79,7 @@ private NamedQuery(JpaQueryMethod method, EntityManager em) {
 
 		this.declaredQuery = DeclaredQuery.of(queryString, false);
 
-		boolean weNeedToCreateCountQuery = !namedCountQueryIsPresent && method.getParameters().hasPageableParameter();
+		boolean weNeedToCreateCountQuery = !namedCountQueryIsPresent && method.getParameters().hasLimitingParameters();
 		boolean cantExtractQuery = !extractor.canExtractQuery();
 
 		if (weNeedToCreateCountQuery && cantExtractQuery) {

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java

@@ -96,7 +96,7 @@ Query bindAndPrepare(Query query, QueryParameterSetter.QueryMetadata metadata,
 
 		bind(query, metadata, accessor);
 
-		if (!useJpaForPaging || !parameters.hasPageableParameter() || accessor.getPageable().isUnpaged()) {
+		if (!useJpaForPaging || !parameters.hasLimitingParameters() || accessor.getPageable().isUnpaged()) {
 			return query;
 		}
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java

@@ -29,11 +29,14 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
 import org.springframework.data.jpa.domain.sample.Role;
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -53,6 +56,7 @@
  * @author Oliver Gierke
  * @author Krzysztof Krason
  * @author Greg Turnquist
+ * @author Mark Paluch
  * @see QueryLookupStrategy
  */
 @ExtendWith(SpringExtension.class)
@@ -221,6 +225,23 @@ void executesQueryToSliceWithUnpaged() {
 		assertThat(slice.hasNext()).isFalse();
 	}
 
+	@Test // DATAJPA-94
+	void executesQueryWithLimitAndScrollPosition() {
+
+		Window<User> first = userRepository.findByLastnameOrderByFirstname(Limit.of(1), //
+				ScrollPosition.offset(), //
+				"Matthews" //
+		);
+
+		Window<User> next = userRepository.findByLastnameOrderByFirstname(Limit.of(1), //
+				ScrollPosition.offset(1), //
+				"Matthews" //
+		);
+
+		assertThat(first).containsExactly(dave);
+		assertThat(next).containsExactly(oliver);
+	}
+
 	@Test // DATAJPA-830
 	void executesMethodWithNotContainingOnStringCorrectly() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java

@@ -15,13 +15,9 @@
  */
 package org.springframework.data.jpa.repository.query;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.QueryHint;
@@ -159,13 +155,17 @@ void returnsQueryIfAvailable() throws Exception {
 	@Test
 	void rejectsInvalidReturntypeOnPagebleFinder() {
 
+		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+
 		assertThatIllegalStateException()
 				.isThrownBy(() -> new JpaQueryMethod(invalidReturnType, metadata, factory, extractor));
 	}
 
 	@Test
 	void rejectsPageableAndSortInFinderMethod() {
 
+		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+
 		assertThatIllegalStateException()
 				.isThrownBy(() -> new JpaQueryMethod(pageableAndSort, metadata, factory, extractor));
 	}

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

@@ -26,6 +26,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.OffsetScrollPosition;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -226,6 +227,8 @@ Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(S
 
 	Page<User> findByLastnameIgnoringCase(Pageable pageable, String lastname);
 
+	Window<User> findByLastnameOrderByFirstname(Limit limit, ScrollPosition scrollPosition, String lastname);
+
 	List<User> findByLastnameIgnoringCaseLike(String lastname);
 
 	List<User> findByLastnameAndFirstnameAllIgnoringCase(String lastname, String firstname);