Skip to content

Commit 3ca4985

Browse files
use node.asString() for Jackson 3, bump version to 3.1.1
1 parent 6283896 commit 3ca4985

9 files changed

Lines changed: 13 additions & 8 deletions

File tree

modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ public class JSON {
153153
// Get the value of the discriminator property, if present in the input payload.
154154
node = node.get(discriminatorName);
155155
if (node != null && node.isValueNode()) {
156+
{{^useJackson3}}
156157
String discrValue = node.asText();
158+
{{/useJackson3}}
159+
{{#useJackson3}}
160+
String discrValue = node.asString();
161+
{{/useJackson3}}
157162
if (discrValue != null) {
158163
return discrValue;
159164
}

modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ext {
8383
jackson_annotations_version = "2.21"
8484
{{/useJackson3}}
8585
{{#useJackson3}}
86-
jackson3_version = "3.1.0"
86+
jackson3_version = "3.1.1"
8787
jackson_annotations_version = "2.21"
8888
{{/useJackson3}}
8989
{{#useJakartaEe}}

modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
340340
{{/useJackson3}}
341341
{{#useJackson3}}
342-
<jackson3-version>3.1.0</jackson3-version>
342+
<jackson3-version>3.1.1</jackson3-version>
343343
<jackson-annotations-version>2.21</jackson-annotations-version>
344344
{{/useJackson3}}
345345
{{#useJakartaEe}}

samples/client/petstore/java/native-jackson3-jspecify/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ artifacts {
6666

6767

6868
ext {
69-
jackson3_version = "3.1.0"
69+
jackson3_version = "3.1.1"
7070
jackson_annotations_version = "2.21"
7171
jakarta_annotation_version = "1.3.5"
7272
beanvalidation_version = "2.0.2"

samples/client/petstore/java/native-jackson3-jspecify/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
257257
<maven.compiler.source>17</maven.compiler.source>
258258
<maven.compiler.target>17</maven.compiler.target>
259-
<jackson3-version>3.1.0</jackson3-version>
259+
<jackson3-version>3.1.1</jackson3-version>
260260
<jackson-annotations-version>2.21</jackson-annotations-version>
261261
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
262262
<beanvalidation-version>2.0.2</beanvalidation-version>

samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/JSON.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ String getDiscriminatorValue(JsonNode node) {
110110
// Get the value of the discriminator property, if present in the input payload.
111111
node = node.get(discriminatorName);
112112
if (node != null && node.isValueNode()) {
113-
String discrValue = node.asText();
113+
String discrValue = node.asString();
114114
if (discrValue != null) {
115115
return discrValue;
116116
}

samples/client/petstore/java/native-jackson3/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ artifacts {
6666

6767

6868
ext {
69-
jackson3_version = "3.1.0"
69+
jackson3_version = "3.1.1"
7070
jackson_annotations_version = "2.21"
7171
jakarta_annotation_version = "1.3.5"
7272
beanvalidation_version = "2.0.2"

samples/client/petstore/java/native-jackson3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
252252
<maven.compiler.source>17</maven.compiler.source>
253253
<maven.compiler.target>17</maven.compiler.target>
254-
<jackson3-version>3.1.0</jackson3-version>
254+
<jackson3-version>3.1.1</jackson3-version>
255255
<jackson-annotations-version>2.21</jackson-annotations-version>
256256
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
257257
<beanvalidation-version>2.0.2</beanvalidation-version>

samples/client/petstore/java/native-jackson3/src/main/java/org/openapitools/client/JSON.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ String getDiscriminatorValue(JsonNode node) {
110110
// Get the value of the discriminator property, if present in the input payload.
111111
node = node.get(discriminatorName);
112112
if (node != null && node.isValueNode()) {
113-
String discrValue = node.asText();
113+
String discrValue = node.asString();
114114
if (discrValue != null) {
115115
return discrValue;
116116
}

0 commit comments

Comments
 (0)