diff --git a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectDeserializer.java b/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectDeserializer.java
index 419c44ba9..c27e3c896 100644
--- a/datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectDeserializer.java
+++ b/datamodel/odata-v4/odata-v4-core/src/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/datamodel/openapi/openapi-generator/src/main/java/com/sap/cloud/sdk/datamodel/openapi/generator/ApiClassNameFieldPreprocessor.java b/datamodel/openapi/openapi-generator/src/main/java/com/sap/cloud/sdk/datamodel/openapi/generator/ApiClassNameFieldPreprocessor.java
index 772d8379d..cb52a2624 100644
--- a/datamodel/openapi/openapi-generator/src/main/java/com/sap/cloud/sdk/datamodel/openapi/generator/ApiClassNameFieldPreprocessor.java
+++ b/datamodel/openapi/openapi-generator/src/main/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
index f8ed9e03e..3b50d4b4f 100644
--- a/dependency-bundles/bom/pom.xml
+++ b/dependency-bundles/bom/pom.xml
@@ -36,7 +36,7 @@
Stable
5.6.0-SNAPSHOT
- 0.10.3
+ 0.10.4
4.4.16
5.2.4
@@ -68,7 +68,7 @@
2.2.0
2.10.1
- 2.16.2
+ 2.17.0
1.2.3
@@ -270,7 +270,7 @@
com.google.errorprone
error_prone_annotations
- 2.25.0
+ 2.26.1
diff --git a/pom.xml b/pom.xml
index 37db1783a..a9253b42a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
**/odata/namespaces/**,**/odata/services/**,**/odatav4/namespaces/**,**/odatav4/services/**,**/soap/client/**,**/testclasses/**
4.71.11
- 2.16.2
+ 2.17.0
1.10
20240303
@@ -94,7 +94,7 @@
- 6.1.4
+ 6.1.5
6.1.5
2.0.12
3.25.3