Consider Tuples in Keyset extraction.

We now consider Tuple values when the query uses tuples for e.g. interface projections when extracting keyset values. Closes #3077

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java

@@ -17,6 +17,7 @@
 
 import jakarta.persistence.IdClass;
 import jakarta.persistence.PersistenceUnitUtil;
+import jakarta.persistence.Tuple;
 import jakarta.persistence.metamodel.Attribute;
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.IdentifiableType;
@@ -34,6 +35,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.springframework.beans.BeanWrapper;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -154,6 +156,11 @@ public ID getId(T entity) {
 
 // If it's a simple type, then immediately delegate to the provider
 if (idMetadata.hasSimpleId()) {
+
+if (entity instanceof Tuple t) {
+return (ID) t.get(idMetadata.getSimpleIdAttribute().getName());
+}
+
 return (ID) persistenceUnitUtil.getIdentifier(entity);
 }
 
@@ -225,27 +232,38 @@ public boolean isNew(T entity) {
 @Override
 public Map<String, Object> getKeyset(Iterable<String> propertyPaths, T entity) {
 
-// TODO: Proxy handling requires more elaborate refactoring, see
-// https://github.com/spring-projects/spring-data-jpa/issues/2784
-BeanWrapper entityWrapper = new DirectFieldAccessFallbackBeanWrapper(entity);
+Function<String, Object> getter = getPropertyValueFunction(entity);
 
 Map<String, Object> keyset = new LinkedHashMap<>();
 
 if (hasCompositeId()) {
 for (String idAttributeName : getIdAttributeNames()) {
-keyset.put(idAttributeName, entityWrapper.getPropertyValue(idAttributeName));
+keyset.put(idAttributeName, getter.apply(idAttributeName));
 }
 } else {
 keyset.put(getIdAttribute().getName(), getId(entity));
 }
 
 for (String propertyPath : propertyPaths) {
-keyset.put(propertyPath, entityWrapper.getPropertyValue(propertyPath));
+keyset.put(propertyPath, getter.apply(propertyPath));
 }
 
 return keyset;
 }
 
+private Function<String, Object> getPropertyValueFunction(Object entity) {
+
+if (entity instanceof Tuple t) {
+return t::get;
+}
+
+// TODO: Proxy handling requires more elaborate refactoring, see
+// https://github.com/spring-projects/spring-data-jpa/issues/2784
+BeanWrapper entityWrapper = new DirectFieldAccessFallbackBeanWrapper(entity);
+
+return entityWrapper::getPropertyValue;
+}
+
 /**
  * Simple value object to encapsulate id specific metadata.
  *

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

@@ -43,6 +43,7 @@
 import org.springframework.data.jpa.repository.sample.RoleRepository;
 import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.data.jpa.repository.sample.UserRepository.IdOnly;
+import org.springframework.data.jpa.repository.sample.UserRepository.NameOnly;
 import org.springframework.data.jpa.repository.sample.UserRepository.RolesAndFirstname;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.test.context.ContextConfiguration;
@@ -242,6 +243,19 @@ void executesQueryWithLimitAndScrollPosition() {
 assertThat(next).containsExactly(oliver);
 }
 
+@Test // GH-3077
+void shouldProjectWithKeysetScrolling() {
+
+Window<NameOnly> first = userRepository.findTop1ByLastnameOrderByFirstname(ScrollPosition.keyset(), //
+"Matthews");
+
+Window<NameOnly> next = userRepository.findTop1ByLastnameOrderByFirstname(first.positionAt(0), //
+"Matthews");
+
+assertThat(first.getContent()).extracting(NameOnly::getFirstname).containsOnly(dave.getFirstname());
+assertThat(next.getContent()).extracting(NameOnly::getFirstname).containsOnly(oliver.getFirstname());
+}
+
 @Test // DATAJPA-830
 void executesMethodWithNotContainingOnStringCorrectly() {
 

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

@@ -229,6 +229,8 @@ Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(S
 
 Window<User> findByLastnameOrderByFirstname(Limit limit, ScrollPosition scrollPosition, String lastname);
 
+Window<NameOnly> findTop1ByLastnameOrderByFirstname(ScrollPosition scrollPosition, String lastname);
+
 List<User> findByLastnameIgnoringCaseLike(String lastname);
 
 List<User> findByLastnameAndFirstnameAllIgnoringCase(String lastname, String firstname);