Skip to content

Commit 866e814

Browse files
authored
feat(spring): enable openApiNullable with useJackson3 (#23331)
* fix: allow `openApiNullable` with `useJackson3` * chore: update jackson-databind-nullable to 0.2.10
1 parent 991d0d1 commit 866e814

File tree

295 files changed

+294
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+294
-322
lines changed

docs/generators/java-camel.md

Lines changed: 1 addition & 1 deletion

docs/generators/spring.md

Lines changed: 1 addition & 1 deletion

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public SpringCodegen() {
306306
cliOptions.add(CliOption.newBoolean(USE_SPRING_BOOT4,
307307
"Generate code and provide dependencies for use with Spring Boot 4.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.",
308308
useSpringBoot4));
309-
cliOptions.add(CliOption.newBoolean(USE_JACKSON_3, "Set it in order to use jackson 3 dependencies (only allowed when `" + USE_SPRING_BOOT4 + "` is set and incompatible with `"+OPENAPI_NULLABLE+"`).", useJackson3));
309+
cliOptions.add(CliOption.newBoolean(USE_JACKSON_3, "Set it in order to use jackson 3 dependencies (only allowed when `" + USE_SPRING_BOOT4 + "` is set).", useJackson3));
310310
cliOptions.add(new CliOption(INCLUDE_HTTP_REQUEST_CONTEXT,
311311
"Whether to include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods. Defaults to 'true' for reactive and 'false' for blocking.",
312312
SchemaTypeUtil.BOOLEAN_TYPE).defaultValue("true (reactive) / false (blocking)"));
@@ -535,9 +535,6 @@ public void processOpts() {
535535
if(isUseJackson3() && !isUseSpringBoot4()){
536536
throw new IllegalArgumentException("useJackson3 is only available with Spring Boot >= 4");
537537
}
538-
if(isUseJackson3() && isOpenApiNullable()){
539-
throw new IllegalArgumentException("openApiNullable cannot be set with useJackson3");
540-
}
541538
if(this.useJackson3){
542539
this.applyJackson3Package();
543540
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ ext {
118118
jackson_annotations_version = "2.21"
119119
jackson_databind_version = "2.21.1"
120120
{{#openApiNullable}}
121-
jackson_databind_nullable_version = "0.2.9"
121+
jackson_databind_nullable_version = "0.2.10"
122122
{{/openApiNullable}}
123123
jakarta_annotation_version = "1.3.5"
124124
{{#useBeanValidation}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ ext {
118118
jackson_annotations_version = "2.21"
119119
jackson_databind_version = "2.21.1"
120120
{{#openApiNullable}}
121-
jackson_databind_nullable_version = "0.2.9"
121+
jackson_databind_nullable_version = "0.2.10"
122122
{{/openApiNullable}}
123123
jakarta_annotation_version = "1.3.5"
124124
httpclient_version = "5.1.3"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<jackson-annotations-version>2.21</jackson-annotations-version>
356356
<jackson-databind-version>2.21.1</jackson-databind-version>
357357
{{#openApiNullable}}
358-
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
358+
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
359359
{{/openApiNullable}}
360360
{{#useJakartaEe}}
361361
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ ext {
108108
jackson_databind_version = "2.21.1"
109109
{{/jackson}}
110110
{{#openApiNullable}}
111-
jackson_databind_nullable_version = "0.2.9"
111+
jackson_databind_nullable_version = "0.2.10"
112112
{{/openApiNullable}}
113113
jakarta_annotation_version = "1.3.5"
114114
feign_version = "13.5"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
<gson-version>2.10.1</gson-version>
418418
{{/gson}}
419419
{{#openApiNullable}}
420-
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
420+
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
421421
{{/openApiNullable}}
422422
{{#useJakartaEe}}
423423
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ext {
101101
jackson_version = "2.19.2"
102102
jackson_databind_version = "2.19.2"
103103
{{#openApiNullable}}
104-
jackson_databind_nullable_version = "0.2.9"
104+
jackson_databind_nullable_version = "0.2.10"
105105
{{/openApiNullable}}
106106
jakarta_annotation_version = "1.3.5"
107107
google_api_client_version = "1.32.2"

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
<jackson-version>2.19.2</jackson-version>
314314
<jackson-databind-version>2.19.2</jackson-databind-version>
315315
{{#openApiNullable}}
316-
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
316+
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
317317
{{/openApiNullable}}
318318
{{#joda}}
319319
<jodatime-version>2.9.9</jodatime-version>

0 commit comments

Comments
 (0)