Polishing.

Reformat 'applyScrollOrderBy'.

See #2149

Signed-off-by: Artemiy Chereshnevvv <[email protected]>

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;
@@ -65,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}.

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) {