Correctly apply OffsetScrollPosition to derived queries.

We now apply the scroll position correctly regardless of whether the query is limited.
Previously, we applied the position only if the query was limited.

Closes #3015

Author: mp911de

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

@@ -255,11 +255,11 @@ public Query createQuery(JpaParametersParameterAccessor accessor) {
 		@SuppressWarnings("ConstantConditions")
 		private Query restrictMaxResultsIfNecessary(Query query, @Nullable ScrollPosition scrollPosition) {
 
-			if (tree.isLimiting()) {
+			if (scrollPosition instanceof OffsetScrollPosition offset) {
+				query.setFirstResult(Math.toIntExact(offset.getOffset()));
+			}
 
-				if (scrollPosition instanceof OffsetScrollPosition offset) {
-					query.setFirstResult(Math.toIntExact(offset.getOffset()));
-				}
+			if (tree.isLimiting()) {
 
 				if (query.getMaxResults() != Integer.MAX_VALUE) {
 					/*

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

@@ -57,7 +57,6 @@
 import org.springframework.data.domain.*;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.domain.ExampleMatcher.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.sample.Address;
 import org.springframework.data.jpa.domain.sample.QUser;
@@ -1428,6 +1427,22 @@ void scrollByPartTreeKeysetBackward() {
 		assertThat(previousWindow.hasNext()).isFalse();
 	}
 
+	@Test // GH-3015
+	void shouldApplyOffsetScrollPosition() {
+
+		User jane1 = new User("Jane", "Doe", "[email protected]");
+		User jane2 = new User("Jane", "Doe", "[email protected]");
+		User john1 = new User("John", "Doe", "[email protected]");
+		User john2 = new User("John", "Doe", "[email protected]");
+
+		repository.saveAllAndFlush(Arrays.asList(john1, john2, jane1, jane2));
+
+		Window<User> atOffset3 = repository.findByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc("J",
+				ScrollPosition.offset(3));
+
+		assertThat(atOffset3).containsExactly(john2);
+	}
+
 	@Test // DATAJPA-491
 	void sortByNestedAssociationPropertyWithSortInPageable() {
 

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.OffsetScrollPosition;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -155,6 +156,8 @@ public interface UserRepository extends JpaRepository<User, Integer>, JpaSpecifi
 	Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(String firstname,
 			ScrollPosition position);
 
+	Window<User> findByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(String firstname, ScrollPosition position);
+
 	List<User> findByFirstnameNotIn(Collection<String> firstnames);
 
 	// DATAJPA-292
@@ -722,6 +725,8 @@ List<String> findAllAndSortByFunctionResultNamedParameter(@Param("namedParameter
 	@Query("select u from User u where u.firstname >= (select Min(u0.firstname) from User u0)")
 	List<NameOnly> findProjectionBySubselect();
 
+	Window<User> findBy(OffsetScrollPosition position);
+
 	interface RolesAndFirstname {
 
 		String getFirstname();