From 38f391c836476d8f4e369fda652373a4837c46ff Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 1 Aug 2022 14:37:59 +0200 Subject: [PATCH] Polishing. See #2607 --- .../query/QueryParameterSetterFactory.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java index c27abbd2b..1b21b0f8e 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java @@ -15,12 +15,12 @@ */ package org.springframework.data.jpa.repository.query; -import java.util.List; -import java.util.function.Function; - import jakarta.persistence.Query; import jakarta.persistence.TemporalType; +import java.util.List; +import java.util.function.Function; + import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter; import org.springframework.data.jpa.repository.query.ParameterMetadataProvider.ParameterMetadata; import org.springframework.data.jpa.repository.query.QueryParameterSetter.NamedOrIndexedQueryParameterSetter; @@ -260,7 +260,7 @@ abstract class QueryParameterSetterFactory { private static class CriteriaQueryParameterSetterFactory extends QueryParameterSetterFactory { private final JpaParameters parameters; - private final List> expressions; + private final List> parameterMetadata; /** * Creates a new {@link QueryParameterSetterFactory} from the given {@link JpaParameters} and @@ -275,7 +275,7 @@ abstract class QueryParameterSetterFactory { Assert.notNull(metadata, "Expressions must not be null"); this.parameters = parameters; - this.expressions = metadata; + this.parameterMetadata = metadata; } @Override @@ -284,15 +284,15 @@ abstract class QueryParameterSetterFactory { int parameterIndex = binding.getRequiredPosition() - 1; Assert.isTrue( // - parameterIndex < expressions.size(), // + parameterIndex < parameterMetadata.size(), // () -> String.format( // "At least %s parameter(s) provided but only %s parameter(s) present in query", // binding.getRequiredPosition(), // - expressions.size() // + parameterMetadata.size() // ) // ); - ParameterMetadata metadata = expressions.get(parameterIndex); + ParameterMetadata metadata = parameterMetadata.get(parameterIndex); if (metadata.isIsNullParameter()) { return QueryParameterSetter.NOOP; @@ -301,9 +301,8 @@ abstract class QueryParameterSetterFactory { JpaParameter parameter = parameters.getBindableParameter(parameterIndex); TemporalType temporalType = parameter.isTemporalParameter() ? parameter.getRequiredTemporalType() : null; - return new NamedOrIndexedQueryParameterSetter(values -> { - return getAndPrepare(parameter, metadata, values); - }, metadata.getExpression(), temporalType); + return new NamedOrIndexedQueryParameterSetter(values -> getAndPrepare(parameter, metadata, values), + metadata.getExpression(), temporalType); } @Nullable