code: more beautiful query building

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

Author: chrshnv

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

@@ -201,12 +201,10 @@ public String build(MapSqlParameterSource parameterSource) {
 
 			SelectBuilder.SelectLimitOffset limitOffsetBuilder = createSelectClause(entity, table);
 			SelectBuilder.SelectWhere whereBuilder = applyLimitAndOffset(limitOffsetBuilder);
-			criteria = applyScrollCriteria(criteria, scrollPosition, sort);
 
 			SelectBuilder.SelectOrdered selectOrderBuilder = applyCriteria(criteria, entity, table, parameterSource,
 					whereBuilder);
 
-			sort = applyCriteriaOrderBy(sort, scrollPosition);
 			selectOrderBuilder = applyOrderBy(sort, entity, table, selectOrderBuilder);
 
 			SelectBuilder.BuildSelect completedBuildSelect = selectOrderBuilder;
@@ -219,7 +217,7 @@ public String build(MapSqlParameterSource parameterSource) {
 			return SqlRenderer.create(renderContextFactory.createRenderContext()).render(select);
 		}
 
-		Sort applyCriteriaOrderBy(Sort sort, @Nullable ScrollPosition scrollPosition) {
+		Sort applyScrollOrderBy(Sort sort, @Nullable ScrollPosition scrollPosition) {
 			if (!(scrollPosition instanceof KeysetScrollPosition) || scrollPosition.isInitial())
 				return sort;
 
@@ -257,28 +255,26 @@ Sort applyCriteriaOrderBy(Sort sort, @Nullable ScrollPosition scrollPosition) {
 				.and(Sort.by(defaultSort, notSorted.toArray(new String[0])));
 		}
 
-		Criteria applyScrollCriteria(Criteria criteria, @Nullable ScrollPosition position, Sort sort) {
+		Criteria applyScrollCriteria(@Nullable ScrollPosition position, Sort sort) {
 			if (!(position instanceof KeysetScrollPosition keyset)
 				|| position.isInitial()
 				|| keyset.getKeys().isEmpty()) {
-				return criteria;
+				return Criteria.empty();
 			}
 
 			Map<String, Object> keys = keyset.getKeys();
 			List<String> columns = new ArrayList<>(keys.keySet());
 			List<Object> values = new ArrayList<>(keys.values());
 
 			if (columns.isEmpty() || values.isEmpty())
-				return criteria;
+				return Criteria.empty();
 
 			Map<String, Sort.Direction> directions =
 				sort.stream().collect(Collectors.toMap(Sort.Order::getProperty, Sort.Order::getDirection));
 
 			Sort.Direction dir = directions.getOrDefault(columns.get(0), Sort.DEFAULT_DIRECTION);
 
-			Criteria scroll = buildKeysetCriteria(columns, values, keyset.scrollsForward(), dir);
-
-			return criteria.and(scroll);
+			return buildKeysetCriteria(columns, values, keyset.scrollsForward(), dir);
 		}
 
 		Criteria buildKeysetCriteria(List<String> columns, List<Object> values, boolean isForward, Sort.Direction dir) {
@@ -313,16 +309,22 @@ Criteria buildKeysetCriteria(List<String> columns, List<Object> values, boolean
 		SelectBuilder.SelectOrdered applyOrderBy(Sort sort, RelationalPersistentEntity<?> entity, Table table,
 				SelectBuilder.SelectOrdered selectOrdered) {
 
-			return sort.isSorted() ? //
-					selectOrdered.orderBy(queryMapper.getMappedSort(table, sort, entity)) //
+			Sort resultSort = applyScrollOrderBy(sort, scrollPosition);
+
+			return resultSort.isSorted() ? //
+					selectOrdered.orderBy(queryMapper.getMappedSort(table, resultSort, entity)) //
 					: selectOrdered;
 		}
 
 		SelectBuilder.SelectOrdered applyCriteria(@Nullable Criteria criteria, RelationalPersistentEntity<?> entity,
 				Table table, MapSqlParameterSource parameterSource, SelectBuilder.SelectWhere whereBuilder) {
 
-			return criteria != null && !criteria.isEmpty() //
-					? whereBuilder.where(queryMapper.getMappedObject(parameterSource, criteria, table, entity)) //
+			Criteria resultCriteria = criteria == null
+				? applyScrollCriteria(scrollPosition, sort)
+				: criteria.and(applyScrollCriteria(scrollPosition, sort));
+
+			return !resultCriteria.isEmpty()
+					? whereBuilder.where(queryMapper.getMappedObject(parameterSource, resultCriteria, table, entity)) //
 					: whereBuilder;
 		}