Skip to content

Commit 3cb1258

Browse files
heowcschauder
authored andcommitted
Polishing.
Move off deprecated classes. Add Nullable annotations. Correct mistakes in documentation. Original pull request #2374
1 parent e1df922 commit 3cb1258

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/main/java/org/springframework/data/jpa/repository/query/JpaParametersParameterAccessor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.query.Parameter;
2020
import org.springframework.data.repository.query.Parameters;
2121
import org.springframework.data.repository.query.ParametersParameterAccessor;
22+
import org.springframework.lang.Nullable;
2223

2324
/**
2425
* {@link org.springframework.data.repository.query.ParameterAccessor} based on an {@link Parameters} instance. It also
@@ -39,6 +40,7 @@ public class JpaParametersParameterAccessor extends ParametersParameterAccessor
3940
super(parameters, values);
4041
}
4142

43+
@Nullable
4244
public <T> T getValue(Parameter parameter) {
4345
return super.getValue(parameter.getIndex());
4446
}

src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.data.domain.SliceImpl;
3535
import org.springframework.data.jpa.provider.PersistenceProvider;
3636
import org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor;
37-
import org.springframework.data.repository.support.PageableExecutionUtils;
37+
import org.springframework.data.support.PageableExecutionUtils;
3838
import org.springframework.data.util.CloseableIterator;
3939
import org.springframework.data.util.StreamUtils;
4040
import org.springframework.lang.Nullable;
@@ -73,7 +73,7 @@ public abstract class JpaQueryExecution {
7373
* Executes the given {@link AbstractStringBasedJpaQuery} with the given {@link ParameterBinder}.
7474
*
7575
* @param query must not be {@literal null}.
76-
* @param values must not be {@literal null}.
76+
* @param accessor must not be {@literal null}.
7777
* @return
7878
*/
7979
@Nullable
@@ -110,7 +110,7 @@ public Object execute(AbstractJpaQuery query, JpaParametersParameterAccessor acc
110110
* Method to implement {@link AbstractStringBasedJpaQuery} executions by single enum values.
111111
*
112112
* @param query
113-
* @param values
113+
* @param accessor
114114
* @return
115115
*/
116116
@Nullable

src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public void bind(QueryParameterSetter.BindableQuery query, JpaParametersParamete
8787
* Binds the parameters to the given query and applies special parameter types (e.g. pagination).
8888
*
8989
* @param query must not be {@literal null}.
90-
* @param values values of method parameters to be assigned to the query parameters.
90+
* @param metadata must not be {@literal null}.
91+
* @param accessor must not be {@literal null}.
9192
*/
9293
Query bindAndPrepare(Query query, QueryParameterSetter.QueryMetadata metadata,
9394
JpaParametersParameterAccessor accessor) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery decla
168168
* Evaluates the given {@link Expression} against the given values.
169169
*
170170
* @param expression must not be {@literal null}.
171-
* @param values must not be {@literal null}.
171+
* @param accessor must not be {@literal null}.
172172
* @return the result of the evaluation.
173173
*/
174174
@Nullable
@@ -250,6 +250,7 @@ private JpaParameter findParameterForBinding(ParameterBinding binding) {
250250
return null;
251251
}
252252

253+
@Nullable
253254
private Object getValue(JpaParametersParameterAccessor accessor, Parameter parameter) {
254255
return accessor.getValue(parameter);
255256
}

0 commit comments

Comments
 (0)