From e88f4fe2991e61ee10b924d9c389b2640b0278c7 Mon Sep 17 00:00:00 2001 From: Daeho Kwon Date: Tue, 29 Apr 2025 22:27:55 +0900 Subject: [PATCH] Adopt to deprecated `QueryMethod` constructor. Original pull request: #2049 Closes: #2025 --- .../data/jdbc/repository/query/JdbcQueryMethod.java | 7 +------ .../data/r2dbc/repository/query/R2dbcQueryMethod.java | 7 +------ .../repository/query/CriteriaFactoryUnitTests.java | 2 +- .../query/ParameterMetadataProviderUnitTests.java | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java index 6d20a1bc..480c88eb 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethod.java @@ -67,7 +67,7 @@ public class JdbcQueryMethod extends QueryMethod { NamedQueries namedQueries, MappingContext, ? extends RelationalPersistentProperty> mappingContext) { - super(method, metadata, factory); + super(method, metadata, factory, JdbcParameters::new); this.namedQueries = namedQueries; this.method = method; this.mappingContext = mappingContext; @@ -75,11 +75,6 @@ public class JdbcQueryMethod extends QueryMethod { this.modifyingQuery = AnnotationUtils.findAnnotation(method, Modifying.class) != null; } - @Override - protected Parameters createParameters(ParametersSource parametersSource) { - return new JdbcParameters(parametersSource); - } - @Override @SuppressWarnings("unchecked") public RelationalEntityMetadata getEntityInformation() { diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java index f210ed90..57ae1340 100644 --- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java +++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java @@ -83,7 +83,7 @@ public class R2dbcQueryMethod extends QueryMethod { public R2dbcQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory projectionFactory, MappingContext, ? extends RelationalPersistentProperty> mappingContext) { - super(method, metadata, projectionFactory); + super(method, metadata, projectionFactory, RelationalParameters::new); Assert.notNull(mappingContext, "MappingContext must not be null"); @@ -123,11 +123,6 @@ public class R2dbcQueryMethod extends QueryMethod { this.lock = Optional.ofNullable(AnnotatedElementUtils.findMergedAnnotation(method, Lock.class)); } - @Override - protected RelationalParameters createParameters(ParametersSource parametersSource) { - return new RelationalParameters(parametersSource); - } - /* (non-Javadoc) * @see org.springframework.data.repository.query.QueryMethod#isCollectionQuery() */ diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/CriteriaFactoryUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/CriteriaFactoryUnitTests.java index 876a3ad4..1d589d69 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/CriteriaFactoryUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/CriteriaFactoryUnitTests.java @@ -78,7 +78,7 @@ public class CriteriaFactoryUnitTests { throw new RuntimeException(e); } return new QueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class), - new SpelAwareProxyProjectionFactory()); + new SpelAwareProxyProjectionFactory(), RelationalParameters::new); } private RelationalParametersParameterAccessor getAccessor(QueryMethod queryMethod, Object... values) { diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java index 36d51702..6e315b9e 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java @@ -82,7 +82,7 @@ public class ParameterMetadataProviderUnitTests { static class RelationalQueryMethod extends QueryMethod { public RelationalQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) { - super(method, metadata, factory); + super(method, metadata, factory, RelationalParameters::new); } }