fix: Spring-boot 3.3.0 (#306)

* fix: Spring-boot 3.3.0

fixing errors in creating parameters caused be changes and removal of deprecations

* fix: Spring-boot 3.3.0

change return type to more specific ArangoParameters

* review

* fixing CI

* deps upd

* tests fix

---------

Co-authored-by: Michele Rastelli <michele@arangodb.com>

Author: baniakjr

.circleci/config.yml

@@ -195,5 +195,5 @@ workflows:
           matrix:
             parameters:
               spring-boot-version:
-                - '3.1.8'
                 - '3.2.6'
+                - '3.3.0'

.github/workflows/maven-deploy.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'

.github/workflows/maven-release.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'

integration-tests/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.6</version>
+        <version>3.3.0</version>
         <relativePath/>
     </parent>
 

pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>3.2.2</version>
+        <version>3.3.0</version>
         <relativePath/>
     </parent>
 
@@ -65,7 +65,7 @@
         <arangodb.version>7.7.1</arangodb.version>
 
         <!-- enforce dependencies convergence -->
-        <slf4j>2.0.11</slf4j>
+        <slf4j>2.0.13</slf4j>
     </properties>
 
     <build>
@@ -163,18 +163,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -266,7 +254,7 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>jackson-dataformat-velocypack</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/arangodb/springframework/repository/query/ArangoParameters.java

@@ -35,6 +35,8 @@
 import org.springframework.core.MethodParameter;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
+import org.springframework.data.repository.query.ParametersSource;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 
 import com.arangodb.model.AqlQueryOptions;
@@ -52,13 +54,13 @@ public class ArangoParameters extends Parameters<ArangoParameters, ArangoParamet
 	private final int queryOptionsIndex;
 	private final int bindVarsIndex;
 
-	public ArangoParameters(final Method method) {
-		super(method);
+	public ArangoParameters(final ParametersSource parametersSource) {
+		super(parametersSource, ArangoParameter::new);
 		assertSingleSpecialParameter(ArangoParameter::isQueryOptions,
-			"Multiple AqlQueryOptions parameters are not allowed! Offending method: " + method);
+			"Multiple AqlQueryOptions parameters are not allowed! Offending method: " + parametersSource.getMethod());
 		assertSingleSpecialParameter(ArangoParameter::isBindVars,
-			"Multiple @BindVars parameters are not allowed! Offending method: " + method);
-		assertNonDuplicateParamNames(method);
+			"Multiple @BindVars parameters are not allowed! Offending method: " + parametersSource.getMethod());
+		assertNonDuplicateParamNames(parametersSource.getMethod());
 		this.queryOptionsIndex = getIndexOfSpecialParameter(ArangoParameter::isQueryOptions);
 		this.bindVarsIndex = getIndexOfSpecialParameter(ArangoParameter::isBindVars);
 	}
@@ -70,11 +72,6 @@ private ArangoParameters(final List<ArangoParameter> parameters, final int query
 		this.bindVarsIndex = bindVarsIndex;
 	}
 
-	@Override
-	protected ArangoParameter createParameter(final MethodParameter parameter) {
-		return new ArangoParameter(parameter);
-	}
-
 	@Override
 	protected ArangoParameters createFrom(final List<ArangoParameter> parameters) {
 		return new ArangoParameters(parameters, this.queryOptionsIndex, this.bindVarsIndex);
@@ -141,7 +138,7 @@ static class ArangoParameter extends Parameter {
 		private final MethodParameter parameter;
 
 		public ArangoParameter(final MethodParameter parameter) {
-			super(parameter);
+			super(parameter, TypeInformation.of(ArangoParameter.class));
 			this.parameter = parameter;
 			assertCorrectBindParamPattern();
 			assertCorrectBindVarsType();

src/main/java/com/arangodb/springframework/repository/query/ArangoQueryMethod.java

@@ -31,6 +31,7 @@
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.StringUtils;
@@ -65,8 +66,8 @@ public ArangoParameters getParameters() {
 	}
 
 	@Override
-	public ArangoParameters createParameters(final Method method) {
-		return new ArangoParameters(method);
+	protected ArangoParameters createParameters(ParametersSource parametersSource) {
+		return new ArangoParameters(parametersSource);
 	}
 
 	public boolean hasAnnotatedQuery() {