Polishing.

Author: mp911de

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

@@ -17,8 +17,10 @@
 
 import jakarta.persistence.EntityManager;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.springframework.data.domain.KeysetScrollPosition;
@@ -40,6 +42,7 @@ class JpaKeysetScrollQueryCreator extends JpaQueryCreator {
 	private final JpaEntityInformation<?, ?> entityInformation;
 	private final KeysetScrollPosition scrollPosition;
 	private final ParameterMetadataProvider provider;
+	private final List<ParameterBinding> bindings = new ArrayList<>();
 
 	public JpaKeysetScrollQueryCreator(PartTree tree, ReturnedType type, ParameterMetadataProvider provider,
 			JpqlQueryTemplates templates, JpaEntityInformation<?, ?> entityInformation, KeysetScrollPosition scrollPosition,
@@ -52,13 +55,23 @@ public JpaKeysetScrollQueryCreator(PartTree tree, ReturnedType type, ParameterMe
 		this.provider = provider;
 	}
 
+	@Override
+	List<ParameterBinding> getParameterBindings() {
+		return bindings;
+	}
+
 	@Override
 	protected JpqlQueryBuilder.AbstractJpqlQuery createQuery(@Nullable JpqlQueryBuilder.Predicate predicate, Sort sort) {
 
 		KeysetScrollSpecification<Object> keysetSpec = new KeysetScrollSpecification<>(scrollPosition, sort,
 				entityInformation);
 		JpqlQueryBuilder.Predicate keysetPredicate = keysetSpec.createJpqlPredicate(getFrom(), getEntity(), value -> {
-			return JpqlQueryBuilder.expression(render(provider.synthetic(value)));
+
+			int position = provider.nextPosition();
+			bindings.add(new ParameterBinding(ParameterBinding.BindingIdentifier.of(position + 1),
+					ParameterBinding.ParameterOrigin.synthetic(value)));
+
+			return JpqlQueryBuilder.expression(render(position));
 		});
 
 		JpqlQueryBuilder.Select query = buildQuery(keysetSpec.sort());

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

@@ -27,6 +27,7 @@
 import jakarta.persistence.metamodel.SingularAttribute;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -108,6 +109,10 @@ public List<ParameterMetadata<?>> getParameterExpressions() {
 		return provider.getExpressions();
 	}
 
+	List<ParameterBinding> getParameterBindings() {
+		return Collections.emptyList();
+	}
+
 	@Override
 	protected JpqlQueryBuilder.Predicate create(Part part, Iterator<Object> iterator) {
 		return toPredicate(part);
@@ -233,8 +238,12 @@ Collection<String> getRequiredSelection(Sort sort, ReturnedType returnedType) {
 		return returnedType.getInputProperties();
 	}
 
-	String render(ParameterMetadata<?> metadata) {
-		return "?" + (metadata.getPosition() + 1);
+	String render(int position) {
+		return "?" + (position + 1);
+	}
+
+	private String render(ParameterMetadata<?> metadata) {
+		return render(metadata.getPosition());
 	}
 
 	/**

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

@@ -58,29 +58,23 @@ static ParameterBinder createBinder(JpaParameters parameters) {
 	 * {@link jakarta.persistence.criteria.CriteriaQuery}.
 	 *
 	 * @param parameters method parameters that are available for binding, must not be {@literal null}.
-	 * @param metadata must not be {@literal null}.
+	 * @param metadata parameter metadata for method argument parameters, must not be {@literal null}.
+	 * @param bindings additional (e.g. synthetic) bindings, must not be {@literal null}.
 	 * @return a {@link ParameterBinder} that can assign values for the method parameters to query parameters of a
 	 *         {@link jakarta.persistence.criteria.CriteriaQuery}
 	 */
-	static ParameterBinder createCriteriaBinder(JpaParameters parameters, List<ParameterMetadata<?>> metadata) {
+	static ParameterBinder createCriteriaBinder(JpaParameters parameters, List<ParameterMetadata<?>> metadata,
+			List<ParameterBinding> bindings) {
 
 		Assert.notNull(parameters, "JpaParameters must not be null");
 		Assert.notNull(metadata, "Parameter metadata must not be null");
 
-		QueryParameterSetterFactory setterFactory = QueryParameterSetterFactory.forPartTreeQuery(parameters, metadata);
-		List<ParameterBinding> bindings = getBindings(parameters);
-
-		if (metadata.size() > parameters.getNumberOfParameters()) {
-			for (int i = parameters.getNumberOfParameters() - 1; i < metadata.size(); i++) {
-
-				ParameterMetadata<?> meta = metadata.get(i);
-				ParameterBinding binding = new ParameterBinding(BindingIdentifier.of(meta.getPosition() + 1),
-						ParameterOrigin.synthetic(meta.getValue()));
-				bindings.add(binding);
-			}
-		}
+		List<ParameterBinding> bindingsToUse = getBindings(parameters);
+		bindingsToUse.addAll(bindings);
 
-		return new ParameterBinder(parameters, createSetters(bindings, setterFactory));
+		return new ParameterBinder(parameters,
+				createSetters(bindingsToUse, QueryParameterSetterFactory.forPartTreeQuery(parameters, metadata),
+						QueryParameterSetterFactory.forSynthetic()));
 	}
 
 	/**
@@ -113,7 +107,7 @@ static ParameterBinder createQueryAwareBinder(JpaParameters parameters, Declared
 				!query.usesPaging());
 	}
 
-	private static List<ParameterBinding> getBindings(JpaParameters parameters) {
+	static List<ParameterBinding> getBindings(JpaParameters parameters) {
 
 		List<ParameterBinding> result = new ArrayList<>();
 		int bindableParameterIndex = 0;

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

@@ -181,20 +181,8 @@ private <T> ParameterMetadata<T> next(Part part, Class<T> type, Parameter parame
 		return metadata;
 	}
 
-	/**
-	 * Create synthetic parameter metadata for a captured value.
-	 *
-	 * @param value
-	 * @return
-	 */
-	public ParameterMetadata<?> synthetic(Object value) {
-
-		int currentPosition = position++;
-		ParameterMetadata<?> metadata = new ParameterMetadata<>(value, Type.SIMPLE_PROPERTY, currentPosition, templates,
-				escape, false, false);
-		expressions.add(metadata);
-
-		return metadata;
+	public int nextPosition() {
+		return position++;
 	}
 
 	EscapeCharacter getEscape() {

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

@@ -232,7 +232,8 @@ public Query createQuery(JpaParametersParameterAccessor accessor) {
 			}
 
 			List<ParameterMetadataProvider.ParameterMetadata<?>> expressions = creator.getParameterExpressions();
-			ParameterBinder binder = ParameterBinderFactory.createCriteriaBinder(parameters, expressions);
+			ParameterBinder binder = ParameterBinderFactory.createCriteriaBinder(parameters, expressions,
+					creator.getParameterBindings());
 
 			ScrollPosition scrollPosition = accessor.getParameters().hasScrollPositionParameter()
 					? accessor.getScrollPosition()

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

@@ -79,6 +79,10 @@ static QueryParameterSetterFactory forPartTreeQuery(JpaParameters parameters, Li
 		return new PartTreeQueryParameterSetterFactory(parameters, metadata);
 	}
 
+	static QueryParameterSetterFactory forSynthetic() {
+		return new SyntheticParameterSetterFactory();
+	}
+
 	/**
 	 * Creates a new {@link QueryParameterSetterFactory} for the given {@link SpelExpressionParser},
 	 * {@link EvaluationContextProvider} and {@link Parameters}.
@@ -211,6 +215,25 @@ private Object evaluateExpression(Expression expression, JpaParametersParameterA
 		}
 	}
 
+	/**
+	 * Handles synthetic bindings that have been captured during parameter augmenting.
+	 *
+	 * @author Mark Paluch
+	 * @since 4.0
+	 */
+	private static class SyntheticParameterSetterFactory extends QueryParameterSetterFactory {
+
+		@Override
+		public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery declaredQuery) {
+
+			if (!(binding.getOrigin() instanceof ParameterBinding.Synthetic s)) {
+				return null;
+			}
+
+			return createSetter(values -> s.value(), binding, null);
+		}
+	}
+
 	/**
 	 * Extracts values for parameter bindings from method parameters. It handles named as well as indexed parameters.
 	 *
@@ -258,9 +281,7 @@ public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery decla
 
 		@Nullable
 		private Object getValue(JpaParametersParameterAccessor accessor, Parameter parameter) {
-			Object value = accessor.getValue(parameter);
-
-			return value;
+			return accessor.getValue(parameter);
 		}
 	}
 
@@ -293,6 +314,10 @@ private static class PartTreeQueryParameterSetterFactory extends QueryParameterS
 		@Override
 		public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery declaredQuery) {
 
+			if (binding.getOrigin() instanceof ParameterBinding.Synthetic) {
+				return null;
+			}
+
 			int parameterIndex = binding.getRequiredPosition() - 1;
 
 			Assert.isTrue( //
@@ -310,15 +335,9 @@ public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery decla
 				return QueryParameterSetter.NOOP;
 			}
 
-			if (binding.getOrigin() instanceof ParameterBinding.Synthetic syntheticValue) {
-				return createSetter(values -> syntheticValue.value(), binding, null);
-			}
-
 			JpaParameter parameter = parameters.getBindableParameter(parameterIndex);
-			TemporalType temporalType = parameter.isTemporalParameter() ? parameter.getRequiredTemporalType() : null;
-
-			return new NamedOrIndexedQueryParameterSetter(values -> getAndPrepare(parameter, metadata, values),
-					ParameterImpl.of(parameter, binding), temporalType);
+			return QueryParameterSetterFactory.createSetter(values -> getAndPrepare(parameter, metadata, values), binding,
+					parameter);
 		}
 
 		@Nullable