From 4630fba49900352aedbe5545922f802fb26e6548 Mon Sep 17 00:00:00 2001 From: heowc Date: Sat, 4 Dec 2021 01:05:32 +0900 Subject: [PATCH] Polishing. Move off deprecated classes. Add Nullable annotations. Correct mistakes in documentation. Original pull request #2374 --- .../repository/query/JpaParametersParameterAccessor.java | 2 ++ .../data/jpa/repository/query/JpaQueryExecution.java | 6 +++--- .../data/jpa/repository/query/ParameterBinder.java | 3 ++- .../jpa/repository/query/QueryParameterSetterFactory.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java index 679614ecb..d32465a8d 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java @@ -19,6 +19,7 @@ import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter; import org.springframework.data.repository.query.Parameter; import org.springframework.data.repository.query.Parameters; import org.springframework.data.repository.query.ParametersParameterAccessor; +import org.springframework.lang.Nullable; /** * {@link org.springframework.data.repository.query.ParameterAccessor} based on an {@link Parameters} instance. It also @@ -39,6 +40,7 @@ public class JpaParametersParameterAccessor extends ParametersParameterAccessor super(parameters, values); } + @Nullable public T getValue(Parameter parameter) { return super.getValue(parameter.getIndex()); } diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java index cb2bc61b4..8c6280738 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java @@ -34,7 +34,7 @@ import org.springframework.data.domain.Slice; import org.springframework.data.domain.SliceImpl; import org.springframework.data.jpa.provider.PersistenceProvider; import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor; -import org.springframework.data.repository.support.PageableExecutionUtils; +import org.springframework.data.support.PageableExecutionUtils; import org.springframework.data.util.CloseableIterator; import org.springframework.data.util.StreamUtils; import org.springframework.lang.Nullable; @@ -75,7 +75,7 @@ public abstract class JpaQueryExecution { * Executes the given {@link AbstractStringBasedJpaQuery} with the given {@link ParameterBinder}. * * @param query must not be {@literal null}. - * @param values must not be {@literal null}. + * @param accessor must not be {@literal null}. * @return */ @Nullable @@ -112,7 +112,7 @@ public abstract class JpaQueryExecution { * Method to implement {@link AbstractStringBasedJpaQuery} executions by single enum values. * * @param query - * @param values + * @param accessor * @return */ @Nullable diff --git a/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java b/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java index 203d59f14..5132797ad 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java @@ -87,7 +87,8 @@ public class ParameterBinder { * Binds the parameters to the given query and applies special parameter types (e.g. pagination). * * @param query must not be {@literal null}. - * @param values values of method parameters to be assigned to the query parameters. + * @param metadata must not be {@literal null}. + * @param accessor must not be {@literal null}. */ Query bindAndPrepare(Query query, QueryParameterSetter.QueryMetadata metadata, JpaParametersParameterAccessor accessor) { diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java index 4b2a12d2a..fb002f850 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java @@ -168,7 +168,7 @@ abstract class QueryParameterSetterFactory { * Evaluates the given {@link Expression} against the given values. * * @param expression must not be {@literal null}. - * @param values must not be {@literal null}. + * @param accessor must not be {@literal null}. * @return the result of the evaluation. */ @Nullable @@ -250,6 +250,7 @@ abstract class QueryParameterSetterFactory { return null; } + @Nullable private Object getValue(JpaParametersParameterAccessor accessor, Parameter parameter) { return accessor.getValue(parameter); }