Skip to content

Commit 38f391c

Browse files
schaudergregturn
authored andcommitted
Polishing.
See #2607
1 parent 9fd0e47 commit 38f391c

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package org.springframework.data.jpa.repository.query;
1717

18-
import java.util.List;
19-
import java.util.function.Function;
20-
2118
import jakarta.persistence.Query;
2219
import jakarta.persistence.TemporalType;
2320

21+
import java.util.List;
22+
import java.util.function.Function;
23+
2424
import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
2525
import org.springframework.data.jpa.repository.query.ParameterMetadataProvider.ParameterMetadata;
2626
import org.springframework.data.jpa.repository.query.QueryParameterSetter.NamedOrIndexedQueryParameterSetter;
@@ -260,7 +260,7 @@ private static String getName(JpaParameter p) {
260260
private static class CriteriaQueryParameterSetterFactory extends QueryParameterSetterFactory {
261261

262262
private final JpaParameters parameters;
263-
private final List<ParameterMetadata<?>> expressions;
263+
private final List<ParameterMetadata<?>> parameterMetadata;
264264

265265
/**
266266
* Creates a new {@link QueryParameterSetterFactory} from the given {@link JpaParameters} and
@@ -275,7 +275,7 @@ private static class CriteriaQueryParameterSetterFactory extends QueryParameterS
275275
Assert.notNull(metadata, "Expressions must not be null");
276276

277277
this.parameters = parameters;
278-
this.expressions = metadata;
278+
this.parameterMetadata = metadata;
279279
}
280280

281281
@Override
@@ -284,15 +284,15 @@ public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery decla
284284
int parameterIndex = binding.getRequiredPosition() - 1;
285285

286286
Assert.isTrue( //
287-
parameterIndex < expressions.size(), //
287+
parameterIndex < parameterMetadata.size(), //
288288
() -> String.format( //
289289
"At least %s parameter(s) provided but only %s parameter(s) present in query", //
290290
binding.getRequiredPosition(), //
291-
expressions.size() //
291+
parameterMetadata.size() //
292292
) //
293293
);
294294

295-
ParameterMetadata<?> metadata = expressions.get(parameterIndex);
295+
ParameterMetadata<?> metadata = parameterMetadata.get(parameterIndex);
296296

297297
if (metadata.isIsNullParameter()) {
298298
return QueryParameterSetter.NOOP;
@@ -301,9 +301,8 @@ public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery decla
301301
JpaParameter parameter = parameters.getBindableParameter(parameterIndex);
302302
TemporalType temporalType = parameter.isTemporalParameter() ? parameter.getRequiredTemporalType() : null;
303303

304-
return new NamedOrIndexedQueryParameterSetter(values -> {
305-
return getAndPrepare(parameter, metadata, values);
306-
}, metadata.getExpression(), temporalType);
304+
return new NamedOrIndexedQueryParameterSetter(values -> getAndPrepare(parameter, metadata, values),
305+
metadata.getExpression(), temporalType);
307306
}
308307

309308
@Nullable

0 commit comments

Comments
 (0)