chore: [DevOps] bump the production-minor-patch group with 9 updates (#…

…361) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johannes Schneider <[email protected]> Co-authored-by: Alexander Dümont <[email protected]> Co-authored-by: Alexander Dümont <[email protected]>
SAP · Mar 19, 2024 · e97462e · e97462e
1 parent 4862c0f
commit e97462e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/...c/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectDeserializer.java b/...c/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectDeserializer.java
@@ -99,7 +99,7 @@ public VdmObject<?> deserialize( @Nonnull final JsonParser parser, @Nonnull fina
                 throw new IOException(
                     "Expected field name at current position of JSON object. Instead there was " + token);
             }
-            final String fieldName = parser.getCurrentName();
+            final String fieldName = parser.currentName();
 
             // Step from JSON element name to element value
             parser.nextToken();

diff --git a/...ain/java/com/sap/cloud/sdk/datamodel/openapi/generator/ApiClassNameFieldPreprocessor.java b/...ain/java/com/sap/cloud/sdk/datamodel/openapi/generator/ApiClassNameFieldPreprocessor.java
@@ -23,7 +23,7 @@ class ApiClassNameFieldPreprocessor implements PreprocessingStep
     @Override
     public PreprocessingStepResult execute( @Nonnull final JsonNode input, @Nonnull final ObjectMapper objectMapper )
     {
-        final String extensionFieldValue = input.path(API_CLASS_NAME_EXTENSION_FIELD).asText(null);
+        final String extensionFieldValue = input.path(API_CLASS_NAME_EXTENSION_FIELD).asText();
 
         final JsonNode paths = input.path("paths");
 
@@ -54,9 +54,14 @@ private void visitPath(
             return;
         }
 
-        final String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText(rootLevelValue);
+        String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText();
+        if( extensionFieldValue == null || extensionFieldValue.isEmpty() ) {
+            extensionFieldValue = rootLevelValue;
+        }
 
-        inputNode.forEach(operation -> visitOperation(operation, mapper, extensionFieldValue));
+        for( final JsonNode jsonNode : inputNode ) {
+            visitOperation(jsonNode, mapper, extensionFieldValue);
+        }
     }
 
     private void visitOperation(
@@ -68,7 +73,10 @@ private void visitOperation(
             return;
         }
 
-        final String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText(pathLevelValue);
+        String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText();
+        if( extensionFieldValue == null || extensionFieldValue.isEmpty() ) {
+            extensionFieldValue = pathLevelValue;
+        }
 
         if( extensionFieldValue != null && !extensionFieldValue.isEmpty() ) {
             changesApplied = true;

diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml
@@ -36,7 +36,7 @@
 		<x-sap-release-maturity>Stable</x-sap-release-maturity>
 		<!-- do not modify the following line, it is updated by the versioning script -->
 		<sdk.version>5.6.0-SNAPSHOT</sdk.version>
-		<service-binding.version>0.10.3</service-binding.version>
+		<service-binding.version>0.10.4</service-binding.version>
 		<!-- HTTP stuff -->
 		<httpcore.version>4.4.16</httpcore.version>
 		<httpcore5.version>5.2.4</httpcore5.version>
@@ -68,7 +68,7 @@
 		<resilience4j.version>2.2.0</resilience4j.version>
 		<!-- JSON & XML stuff -->
 		<gson.version>2.10.1</gson.version>
-		<jackson.version>2.16.2</jackson.version>
+		<jackson.version>2.17.0</jackson.version>
 		<owasp-json-sanitizer.version>1.2.3</owasp-json-sanitizer.version>
 		<!-- end of essential versions -->
 	</properties>
@@ -270,7 +270,7 @@
 			<dependency>
 				<groupId>com.google.errorprone</groupId>
 				<artifactId>error_prone_annotations</artifactId>
-				<version>2.25.0</version>
+				<version>2.26.1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
 		<codeAnalysisExclusions>**/odata/namespaces/**,**/odata/services/**,**/odatav4/namespaces/**,**/odatav4/services/**,**/soap/client/**,**/testclasses/**</codeAnalysisExclusions>
 		<!--  Non-essential dependencies  -->
 		<jco-api.version>4.71.11</jco-api.version>
-		<jackson.version>2.16.2</jackson.version>
+		<jackson.version>2.17.0</jackson.version>
 		<commons-configuration.version>1.10</commons-configuration.version>
 		<!--  WordUtils used twice in OData generator  -->
 		<json.version>20240303</json.version>
@@ -94,7 +94,7 @@
 		<!-- Spring dependencies -->
 		<!-- Keep these versions consistent with the ones from the SAP Java Buildpack (after their 2.0 release) -->
 		<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
-		<spring.version>6.1.4</spring.version>
+		<spring.version>6.1.5</spring.version>
 		<spring-security.version>6.1.5</spring-security.version>
 		<slf4j.version>2.0.12</slf4j.version>
 		<assertj-core.version>3.25.3</assertj-core.version>