diff --git a/coherence-spring-data/src/main/java/com/oracle/coherence/spring/data/repository/query/CoherenceRepositoryQuery.java b/coherence-spring-data/src/main/java/com/oracle/coherence/spring/data/repository/query/CoherenceRepositoryQuery.java index d2aec9dab97..b78020357df 100644 --- a/coherence-spring-data/src/main/java/com/oracle/coherence/spring/data/repository/query/CoherenceRepositoryQuery.java +++ b/coherence-spring-data/src/main/java/com/oracle/coherence/spring/data/repository/query/CoherenceRepositoryQuery.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 2024 Oracle and/or its affiliates. * * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. @@ -39,9 +39,10 @@ import org.springframework.data.domain.Sort; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.repository.core.RepositoryMetadata; -import org.springframework.data.repository.query.DefaultParameters; import org.springframework.data.repository.query.ParameterAccessor; +import org.springframework.data.repository.query.Parameters; import org.springframework.data.repository.query.ParametersParameterAccessor; +import org.springframework.data.repository.query.ParametersSource; import org.springframework.data.repository.query.QueryMethod; import org.springframework.data.repository.query.RepositoryQuery; import org.springframework.data.repository.query.ResultProcessor; @@ -112,7 +113,20 @@ public CoherenceRepositoryQuery(NamedMap namedMap, Method method, RepositoryMeta public Object execute(Object[] parameters) { PartTree partTree = new PartTree(this.method.getName(), this.metadata.getDomainType()); - ParameterAccessor accessor = new ParametersParameterAccessor(new DefaultParameters(this.method), parameters); + + Parameters springDataParameters = new MyDefaultParameters(this.method); + + /* + * Deprecated in Spring Data 2023.1.4 and removed in 2024.0.1 + */ + // Parameters springDataParameters = new DefaultParameters(this.method); + + /* + * Recommended replacement. But this does not work. + */ + // Parameters springDataParameters = new DefaultParameters(ParametersSource.of(this.method)); + + ParameterAccessor accessor = new ParametersParameterAccessor(springDataParameters, parameters); CoherenceQueryCreator creator = new CoherenceQueryCreator(partTree, accessor); QueryResult queryResult = creator.createQuery(); @@ -279,4 +293,24 @@ public QueryMethod getQueryMethod() { return this.queryMethod; } + + /** + * Custom {@link Parameters} implementation, so we can call the super constructor. We should not really have to do + * this. This is a workaround for the fact that the constructor is protected. + */ + class MyDefaultParameters extends Parameters { + + private MyDefaultParameters(List parameters) { + super(parameters); + } + + MyDefaultParameters(Method method) { + super(ParametersSource.of(method), null); + } + + @Override + protected Parameters createFrom(List parameters) { + return new MyDefaultParameters(parameters); + } + } } diff --git a/coherence-spring-site/pom.xml b/coherence-spring-site/pom.xml index 06cc989b2a9..7b476550846 100644 --- a/coherence-spring-site/pom.xml +++ b/coherence-spring-site/pom.xml @@ -25,12 +25,12 @@ ${basedir}/.. 3.0.5 - 2.3.0 + 2.3.1 1.11.1 ${maven.build.timestamp} yyyy-MM-dd HH:mm - 3.6.1 + 3.7.1 diff --git a/pom.xml b/pom.xml index fba7f41a5fb..0437ea9a943 100644 --- a/pom.xml +++ b/pom.xml @@ -114,40 +114,40 @@ 3.0.0 3.5.0 1.0 - 3.2.0 + 3.3.0 1.6.0 0.12 3.13.0 9.2.0 3.1.0 - 3.3.1 - 3.12.1 - 3.1.1 - 3.4.1 + 3.4.0 + 3.13.0 + 3.1.2 + 3.5.0 3.2.4 - 3.1.1 + 3.1.2 0.8.12 3.4.1 - 3.6.3 - 3.0.1 + 3.7.0 + 3.1.0 3.3.1 3.12.1 - 3.3.0 - 3.2.5 - 1.6.13 + 3.3.1 + 3.3.0 + 1.7.0 ${spring-boot.version} - 2.3.15 - 10.13.0 - 0.0.41 + 2.3.17 + 10.17.0 + 0.0.42 0.6.3 0.2.5 3.25.3 4.2.1 - 1.78 + 1.78.1 7.0.2 com.oracle.coherence.ce 24.03 @@ -159,7 +159,7 @@ 2.17.1 10.0.0 2.1.1 - 3.0.0 + 3.1.0 5.0.0 2.0.1 3.30.2-GA @@ -167,15 +167,15 @@ 2.23.1 5.11.0 3.2.0 - 6.1.6 + 6.1.10 3.6.7 2.2.0 2.0.13 - 3.2.5 + 3.3.1 2023.0.1 - 2023.1.4 + 2023.1.4 3.2.2 - 6.2.4 + 6.3.1 10.1.25 diff --git a/samples/circuit-breaker-cache-demo/circuit-breaker-cache-demo-app/pom.xml b/samples/circuit-breaker-cache-demo/circuit-breaker-cache-demo-app/pom.xml index d5131777352..126ae1daf9a 100644 --- a/samples/circuit-breaker-cache-demo/circuit-breaker-cache-demo-app/pom.xml +++ b/samples/circuit-breaker-cache-demo/circuit-breaker-cache-demo-app/pom.xml @@ -23,7 +23,6 @@ ${basedir}/../../.. - 3.1.0 diff --git a/samples/coherence-spring-cloud-config-demo/pom.xml b/samples/coherence-spring-cloud-config-demo/pom.xml index 40f06cad276..dd936078d72 100644 --- a/samples/coherence-spring-cloud-config-demo/pom.xml +++ b/samples/coherence-spring-cloud-config-demo/pom.xml @@ -28,7 +28,7 @@ - 6.9.0.202403050737-r + 6.10.0.202406032230-r diff --git a/src/main/config/dependency-check-suppression.xml b/src/main/config/dependency-check-suppression.xml index 0dc594aa64f..055b3df4d4c 100644 --- a/src/main/config/dependency-check-suppression.xml +++ b/src/main/config/dependency-check-suppression.xml @@ -13,20 +13,4 @@ ]]> CVE-2023-5763 - - - - CVE-2023-48795 - - - - - CVE-2024-29025 -