Commit e88f4fe

kwondh5217schauder

authored and

committed

Adopt to deprecated QueryMethod constructor.

Original pull request: #2049 Closes: #2025

1 parent e6fe49d commit e88f4feCopy full SHA for e88f4fe

File tree

-14

lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query
- JdbcQueryMethod.java
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query
- R2dbcQueryMethod.java
spring-data-relational/src/test/java/org/springframework/data/relational/repository/query
- CriteriaFactoryUnitTests.java
- ParameterMetadataProviderUnitTests.java

-14

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,19 +67,14 @@ public JdbcQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFac`
`67`	`67`	`NamedQueries namedQueries,`
`68`	`68`	`MappingContext<? extends RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> mappingContext) {`
`69`	`69`
`70`		`- super(method, metadata, factory);`
	`70`	`+ super(method, metadata, factory, JdbcParameters::new);`
`71`	`71`	`this.namedQueries = namedQueries;`
`72`	`72`	`this.method = method;`
`73`	`73`	`this.mappingContext = mappingContext;`
`74`	`74`	`this.annotationCache = new ConcurrentReferenceHashMap<>();`
`75`	`75`	`this.modifyingQuery = AnnotationUtils.findAnnotation(method, Modifying.class) != null;`
`76`	`76`	`}`
`77`	`77`
`78`		`- @Override`
`79`		`- protected Parameters<?, ?> createParameters(ParametersSource parametersSource) {`
`80`		`- return new JdbcParameters(parametersSource);`
`81`		`- }`
`82`		`-`
`83`	`78`	`@Override`
`84`	`79`	`@SuppressWarnings("unchecked")`
`85`	`80`	`public RelationalEntityMetadata<?> getEntityInformation() {`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public class R2dbcQueryMethod extends QueryMethod {`
`83`	`83`	`public R2dbcQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory projectionFactory,`
`84`	`84`	`MappingContext<? extends RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> mappingContext) {`
`85`	`85`
`86`		`- super(method, metadata, projectionFactory);`
	`86`	`+ super(method, metadata, projectionFactory, RelationalParameters::new);`
`87`	`87`
`88`	`88`	`Assert.notNull(mappingContext, "MappingContext must not be null");`
`89`	`89`
`@@ -123,11 +123,6 @@ public R2dbcQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFa`
`123`	`123`	`this.lock = Optional.ofNullable(AnnotatedElementUtils.findMergedAnnotation(method, Lock.class));`
`124`	`124`	`}`
`125`	`125`
`126`		`- @Override`
`127`		`- protected RelationalParameters createParameters(ParametersSource parametersSource) {`
`128`		`- return new RelationalParameters(parametersSource);`
`129`		`- }`
`130`		`-`
`131`	`126`	`/* (non-Javadoc)`
`132`	`127`	`* @see org.springframework.data.repository.query.QueryMethod#isCollectionQuery()`
`133`	`128`	`*/`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private QueryMethod getQueryMethod(String methodName, Class<?>... parameterTypes`
`78`	`78`	`throw new RuntimeException(e);`
`79`	`79`	`}`
`80`	`80`	`return new QueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class),`
`81`		`- new SpelAwareProxyProjectionFactory());`
	`81`	`+ new SpelAwareProxyProjectionFactory(), RelationalParameters::new);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`private RelationalParametersParameterAccessor getAccessor(QueryMethod queryMethod, Object... values) {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private ParameterMetadata getParameterMetadata(String methodName, Object value)`
`82`	`82`	`static class RelationalQueryMethod extends QueryMethod {`
`83`	`83`
`84`	`84`	`public RelationalQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) {`
`85`		`- super(method, metadata, factory);`
	`85`	`+ super(method, metadata, factory, RelationalParameters::new);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`

Comments

(0)