Polishing.

Reformat keys extraction code.

See #2149

Signed-off-by: Artemiy Chereshnevvv <chereshnevvv4real@gmail.com>

Polishing.

Reformat 'applyScrollOrderBy'.

See #2149

Signed-off-by: Artemiy Chereshnevvv <chereshnevvv4real@gmail.com>

Author: chrshnv

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQuery.java

@@ -17,10 +17,8 @@
 
 import static org.springframework.data.jdbc.repository.query.JdbcQueryExecution.*;
 
-import java.lang.reflect.Field;
 import java.sql.ResultSet;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -29,7 +27,6 @@
 import java.util.function.IntFunction;
 import java.util.function.LongSupplier;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
@@ -44,6 +41,7 @@
 import org.springframework.data.domain.Window;
 import org.springframework.data.jdbc.core.JdbcAggregateOperations;
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.dialect.Dialect;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
@@ -64,7 +62,6 @@
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * An {@link AbstractJdbcQuery} implementation based on a {@link PartTree}.
@@ -318,19 +315,17 @@ static class ScrollQueryExecution<T> implements JdbcQueryExecution<Window<T>> {
 				if (orders.isEmpty())
 					orders = sort.get().map(Sort.Order::getProperty).toList();
 
-				orders = orders.stream().map(it -> {
-					RelationalPersistentProperty prop = tableEntity.getPersistentProperty(it);
-
+				List<RelationalPersistentProperty> properties = new ArrayList<>();
+				for (String propertyName : orders) {
+					RelationalPersistentProperty prop = tableEntity.getPersistentProperty(propertyName);
 					if (prop == null)
-						return it;
-
-					return prop.getName();
-				}).toList();
+						continue;
 
-				keys = extractKeys(resultList, orders);
+					properties.add(prop);
+				}
 
-				Map<String, Object> finalKeys = keys;
-				positionFunction = (ignoredI) -> ScrollPosition.of(finalKeys, ((KeysetScrollPosition) position).getDirection());
+				final Map<String, Object> resultKeys = extractKeys(resultList, properties);
+				positionFunction = (ignoredI) -> ScrollPosition.of(resultKeys, ((KeysetScrollPosition) position).getDirection());
 			}
 
 			if (positionFunction == null)
@@ -347,26 +342,26 @@ else if (limit.isLimited())
 			return Window.from(resultList, positionFunction, hasNext);
 		}
 
-		private Map<String, Object> extractKeys(List<T> resultList, List<String> orders) {
+		private Map<String, Object> extractKeys(List<T> resultList, List<RelationalPersistentProperty> properties) {
 			if (resultList.isEmpty())
 				return Map.of();
 
+			Map<String, Object> result = new LinkedHashMap<>();
+
 			T last = resultList.get(resultList.size() - 1);
+			PersistentPropertyAccessor<T> accessor = tableEntity.getPropertyAccessor(last);
 
-			Field[] fields = last.getClass().getDeclaredFields();
+			for (RelationalPersistentProperty property : properties) {
+				String propertyName = property.getName();
+				Object propertyValue = accessor.getProperty(property);
 
-			// noinspection DataFlowIssue
-			return Arrays.stream(fields).filter(it -> {
-				String name = it.getName();
+				if (propertyValue == null)
+					continue;
 
-				RelationalPersistentProperty prop = tableEntity.getPersistentProperty(name);
-				if (prop != null)
-					name = prop.getName();
+				result.put(propertyName, propertyValue);
+			}
 
-				String finalName = name;
-				return orders.stream().anyMatch(order -> order.equalsIgnoreCase(finalName));
-			}).peek(ReflectionUtils::makeAccessible).collect(Collectors.toMap(Field::getName,
-					it -> ReflectionUtils.getField(it, last), (e1, e2) -> e1, LinkedHashMap::new));
+			return result;
 		}
 	}
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StatementFactory.java

@@ -237,30 +237,19 @@ Sort applyScrollOrderBy(Sort sort, @Nullable ScrollPosition scrollPosition) {
 			if (!(scrollPosition instanceof KeysetScrollPosition) || scrollPosition.isInitial())
 				return sort;
 
-			Set<String> orders = sort.get().map(Sort.Order::getProperty).map(it -> {
-				RelationalPersistentProperty prop = entity.getPersistentProperty(it);
-				if (prop == null)
-					return it;
-
-				return prop.getName();
-			}).collect(Collectors.toSet());
+			Set<String> sortedProperties = sort.get().map(Sort.Order::getProperty).collect(Collectors.toSet());
 
 			Set<String> keys = ((KeysetScrollPosition) scrollPosition).getKeys().keySet();
 
-			Set<String> notSorted = keys.stream().map(it -> {
-				RelationalPersistentProperty prop = entity.getPersistentProperty(it);
-				if (prop == null)
-					return it;
-
-				return prop.getName();
-			}).filter(it -> orders.stream().noneMatch(order -> order.equalsIgnoreCase(it))).collect(Collectors.toSet());
+			Set<String> notSortedProperties
+				= keys.stream().filter(it -> !sortedProperties.contains(it)).collect(Collectors.toSet());
 
-			if (notSorted.isEmpty())
+			if (notSortedProperties.isEmpty())
 				return sort;
 
 			Sort.Direction defaultSort = sort.get().map(Sort.Order::getDirection).findAny().orElse(Sort.DEFAULT_DIRECTION);
 
-			return sort.and(Sort.by(defaultSort, notSorted.toArray(new String[0])));
+			return sort.and(Sort.by(defaultSort, notSortedProperties.toArray(new String[0])));
 		}
 
 		Criteria applyScrollCriteria(@Nullable ScrollPosition position, Sort sort) {