Skip to content

Commit e97462e

Browse files
dependabot[bot]Johannes Schneidernewtork
authored
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]>
1 parent 4862c0f commit e97462e

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/adapter/JacksonVdmObjectDeserializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public VdmObject<?> deserialize( @Nonnull final JsonParser parser, @Nonnull fina
9999
throw new IOException(
100100
"Expected field name at current position of JSON object. Instead there was " + token);
101101
}
102-
final String fieldName = parser.getCurrentName();
102+
final String fieldName = parser.currentName();
103103

104104
// Step from JSON element name to element value
105105
parser.nextToken();

datamodel/openapi/openapi-generator/src/main/java/com/sap/cloud/sdk/datamodel/openapi/generator/ApiClassNameFieldPreprocessor.java

+12-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ApiClassNameFieldPreprocessor implements PreprocessingStep
2323
@Override
2424
public PreprocessingStepResult execute( @Nonnull final JsonNode input, @Nonnull final ObjectMapper objectMapper )
2525
{
26-
final String extensionFieldValue = input.path(API_CLASS_NAME_EXTENSION_FIELD).asText(null);
26+
final String extensionFieldValue = input.path(API_CLASS_NAME_EXTENSION_FIELD).asText();
2727

2828
final JsonNode paths = input.path("paths");
2929

@@ -54,9 +54,14 @@ private void visitPath(
5454
return;
5555
}
5656

57-
final String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText(rootLevelValue);
57+
String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText();
58+
if( extensionFieldValue == null || extensionFieldValue.isEmpty() ) {
59+
extensionFieldValue = rootLevelValue;
60+
}
5861

59-
inputNode.forEach(operation -> visitOperation(operation, mapper, extensionFieldValue));
62+
for( final JsonNode jsonNode : inputNode ) {
63+
visitOperation(jsonNode, mapper, extensionFieldValue);
64+
}
6065
}
6166

6267
private void visitOperation(
@@ -68,7 +73,10 @@ private void visitOperation(
6873
return;
6974
}
7075

71-
final String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText(pathLevelValue);
76+
String extensionFieldValue = inputNode.path(API_CLASS_NAME_EXTENSION_FIELD).asText();
77+
if( extensionFieldValue == null || extensionFieldValue.isEmpty() ) {
78+
extensionFieldValue = pathLevelValue;
79+
}
7280

7381
if( extensionFieldValue != null && !extensionFieldValue.isEmpty() ) {
7482
changesApplied = true;

dependency-bundles/bom/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<x-sap-release-maturity>Stable</x-sap-release-maturity>
3737
<!-- do not modify the following line, it is updated by the versioning script -->
3838
<sdk.version>5.6.0-SNAPSHOT</sdk.version>
39-
<service-binding.version>0.10.3</service-binding.version>
39+
<service-binding.version>0.10.4</service-binding.version>
4040
<!-- HTTP stuff -->
4141
<httpcore.version>4.4.16</httpcore.version>
4242
<httpcore5.version>5.2.4</httpcore5.version>
@@ -68,7 +68,7 @@
6868
<resilience4j.version>2.2.0</resilience4j.version>
6969
<!-- JSON & XML stuff -->
7070
<gson.version>2.10.1</gson.version>
71-
<jackson.version>2.16.2</jackson.version>
71+
<jackson.version>2.17.0</jackson.version>
7272
<owasp-json-sanitizer.version>1.2.3</owasp-json-sanitizer.version>
7373
<!-- end of essential versions -->
7474
</properties>
@@ -270,7 +270,7 @@
270270
<dependency>
271271
<groupId>com.google.errorprone</groupId>
272272
<artifactId>error_prone_annotations</artifactId>
273-
<version>2.25.0</version>
273+
<version>2.26.1</version>
274274
</dependency>
275275
</dependencies>
276276
</dependencyManagement>

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<codeAnalysisExclusions>**/odata/namespaces/**,**/odata/services/**,**/odatav4/namespaces/**,**/odatav4/services/**,**/soap/client/**,**/testclasses/**</codeAnalysisExclusions>
8585
<!-- Non-essential dependencies -->
8686
<jco-api.version>4.71.11</jco-api.version>
87-
<jackson.version>2.16.2</jackson.version>
87+
<jackson.version>2.17.0</jackson.version>
8888
<commons-configuration.version>1.10</commons-configuration.version>
8989
<!-- WordUtils used twice in OData generator -->
9090
<json.version>20240303</json.version>
@@ -94,7 +94,7 @@
9494
<!-- Spring dependencies -->
9595
<!-- Keep these versions consistent with the ones from the SAP Java Buildpack (after their 2.0 release) -->
9696
<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
97-
<spring.version>6.1.4</spring.version>
97+
<spring.version>6.1.5</spring.version>
9898
<spring-security.version>6.1.5</spring-security.version>
9999
<slf4j.version>2.0.12</slf4j.version>
100100
<assertj-core.version>3.25.3</assertj-core.version>

0 commit comments

Comments
 (0)