Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/generators/java-camel.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|useFeignClientContextId|Whether to generate Feign client with contextId parameter.| |true|
|useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
|useHttpServiceProxyFactoryInterfacesConfigurator|Generate HttpInterfacesAbstractConfigurator based on an HttpServiceProxyFactory instance (as opposed to a WebClient instance, when disabled) for generating Spring HTTP interfaces.| |false|
|useJackson3|Set it in order to use jackson 3 dependencies (only allowed when `useSpringBoot4` is set and incompatible with `openApiNullable`).| |false|
|useJackson3|Set it in order to use jackson 3 dependencies (only allowed when `useSpringBoot4` is set).| |false|
|useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
|useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |true|
|useOptional|Use Optional container for optional parameters| |false|
Expand Down
2 changes: 1 addition & 1 deletion docs/generators/spring.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|useFeignClientContextId|Whether to generate Feign client with contextId parameter.| |true|
|useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
|useHttpServiceProxyFactoryInterfacesConfigurator|Generate HttpInterfacesAbstractConfigurator based on an HttpServiceProxyFactory instance (as opposed to a WebClient instance, when disabled) for generating Spring HTTP interfaces.| |false|
|useJackson3|Set it in order to use jackson 3 dependencies (only allowed when `useSpringBoot4` is set and incompatible with `openApiNullable`).| |false|
|useJackson3|Set it in order to use jackson 3 dependencies (only allowed when `useSpringBoot4` is set).| |false|
|useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
|useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |true|
|useOptional|Use Optional container for optional parameters| |false|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ public SpringCodegen() {
cliOptions.add(CliOption.newBoolean(USE_SPRING_BOOT4,
"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`.",
useSpringBoot4));
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));
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));
cliOptions.add(new CliOption(INCLUDE_HTTP_REQUEST_CONTEXT,
"Whether to include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods. Defaults to 'true' for reactive and 'false' for blocking.",
SchemaTypeUtil.BOOLEAN_TYPE).defaultValue("true (reactive) / false (blocking)"));
Expand Down Expand Up @@ -535,9 +535,6 @@ public void processOpts() {
if(isUseJackson3() && !isUseSpringBoot4()){
throw new IllegalArgumentException("useJackson3 is only available with Spring Boot >= 4");
}
if(isUseJackson3() && isOpenApiNullable()){
throw new IllegalArgumentException("openApiNullable cannot be set with useJackson3");
}
if(this.useJackson3){
this.applyJackson3Package();
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ext {
jackson_annotations_version = "2.21"
jackson_databind_version = "2.21.1"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ext {
jackson_annotations_version = "2.21"
jackson_databind_version = "2.21.1"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
httpclient_version = "5.1.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
<jackson-annotations-version>2.21</jackson-annotations-version>
<jackson-databind-version>2.21.1</jackson-databind-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ext {
jackson_databind_version = "2.21.1"
{{/jackson}}
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
feign_version = "13.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
<gson-version>2.10.1</gson-version>
{{/gson}}
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ext {
jackson_version = "2.19.2"
jackson_databind_version = "2.19.2"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
google_api_client_version = "1.32.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
<jackson-version>2.19.2</jackson-version>
<jackson-databind-version>2.19.2</jackson-databind-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#joda}}
<jodatime-version>2.9.9</jodatime-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ext {
jackson_annotations_version = "2.21"
jackson_databind_version = "2.21.1"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lazy val root = (project in file(".")).
{{/joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
{{#openApiNullable}}
"org.openapitools" % "jackson-databind-nullable" % "0.2.9" % "compile",
"org.openapitools" % "jackson-databind-nullable" % "0.2.10" % "compile",
{{/openApiNullable}}
{{#hasOAuthMethods}}
"com.github.scribejava" % "scribejava-apis" % "8.3.1" % "compile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
<jackson-version>2.21.1</jackson-version>
<jackson-annotations-version>2.21</jackson-annotations-version>
<jackson-databind-version>2.21.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<beanvalidation-version>3.0.2</beanvalidation-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ext {
jackson_annotations_version = "2.21"
jackson_databind_version = "2.21.1"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "2.1.0"
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lazy val root = (project in file(".")).
{{/joda}}
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
{{#openApiNullable}}
"org.openapitools" % "jackson-databind-nullable" % "0.2.9" % "compile",
"org.openapitools" % "jackson-databind-nullable" % "0.2.10" % "compile",
{{/openApiNullable}}
{{#hasOAuthMethods}}
"com.github.scribejava" % "scribejava-apis" % "8.3.1" % "compile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
<jackson-version>2.21.1</jackson-version>
<jackson-annotations-version>2.21</jackson-annotations-version>
<jackson-databind-version>2.21.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<beanvalidation-version>3.0.2</beanvalidation-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "org.openapitools:jackson-databind-nullable:0.2.9"
implementation "org.openapitools:jackson-databind-nullable:0.2.10"
{{/useJackson3}}
{{#useJackson3}}
implementation "tools.jackson.core:jackson-core:$jackson3_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
{{^useJackson3}}
<jackson-version>2.21.1</jackson-version>
<jackson-annotations-version>2.21</jackson-annotations-version>
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/useJackson3}}
{{#useJackson3}}
<jackson3-version>3.1.0</jackson3-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ dependencies {
implementation 'io.gsonfire:gson-fire:1.9.0'
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
{{#openApiNullable}}
implementation 'org.openapitools:jackson-databind-nullable:0.2.9'
implementation 'org.openapitools:jackson-databind-nullable:0.2.10'
{{/openApiNullable}}
{{#withAWSV4Signature}}
implementation 'software.amazon.awssdk:auth:2.20.157'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
"org.apache.commons" % "commons-lang3" % "3.18.0",
"jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
{{#openApiNullable}}
"org.openapitools" % "jackson-databind-nullable" % "0.2.9",
"org.openapitools" % "jackson-databind-nullable" % "0.2.10",
{{/openApiNullable}}
{{#withAWSV4Signature}}
"software.amazon.awssdk" % "auth" % "2.20.157",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
<gson-version>2.10.1</gson-version>
<commons-lang3-version>3.18.0</commons-lang3-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#joda}}
<jodatime-version>2.12.0</jodatime-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ ext {
jackson_version = "2.19.2"
jackson_databind_version = "2.19.2"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
{{/jackson}}
{{#gson}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.19.2",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.19.2",
{{#openApiNullable}}
"org.openapitools" % "jackson-databind-nullable" % "0.2.9",
"org.openapitools" % "jackson-databind-nullable" % "0.2.10",
{{/openApiNullable}}
{{#withXml}}
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.13.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
{{#jackson}}
<jackson-version>2.19.2</jackson-version>
<jackson-databind-version>2.19.2</jackson-databind-version>
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/jackson}}
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ext {
{{/useJackson3}}
jackson_annotations_version = "2.21"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
{{^useSpringBoot4}}
spring_web_version = "6.2.16"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@

<jackson-annotations-version>2.21</jackson-annotations-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#joda}}
<jodatime-version>2.14.0</jodatime-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ext {
jackson_version = "2.19.2"
jackson_databind_version = "2.19.2"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
threetenbp_version = "2.9.10"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
<jackson-version>2.19.2</jackson-version>
<jackson-databind-version>2.19.2</jackson-databind-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ ext {
{{/useJackson3}}
jackson_annotations_version = "2.21"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
{{#useSpringBoot4}}
spring_web_version = "7.0.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@

<jackson-annotations-version>2.21</jackson-annotations-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#joda}}
<jodatime-version>2.9.9</jodatime-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ ext {
jackson_databind_version = "2.19.2"
javax_ws_rs_api_version = "2.1.1"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
{{/jackson}}
{{#usePlayWS}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
<jackson-databind-version>2.19.2</jackson-databind-version>
<jackson-version>2.19.2</jackson-version>
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
{{/jackson}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ext {
vertx_version = "{{#supportVertxFuture}}4.0.0{{/supportVertxFuture}}{{^supportVertxFuture}}3.5.2{{/supportVertxFuture}}"
junit_version = "5.10.3"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
jakarta_annotation_version = "1.3.5"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
{{/swagger2AnnotationLibrary}}
<jackson-version>2.19.2</jackson-version>
<jackson-databind>2.19.2</jackson-databind>
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
{{/useJakartaEe}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ ext {
{{/useJackson3}}
jackson_annotations_version = "2.21"
{{#openApiNullable}}
jackson_databind_nullable_version = "0.2.9"
jackson_databind_nullable_version = "0.2.10"
{{/openApiNullable}}
{{#joda}}
jodatime_version = "2.14.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<jackson-version>2.21.1</jackson-version>
{{/useJackson3}}
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#useJakartaEe}}
{{^useSpringBoot4}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>
{{/useMutiny}}
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
</properties>
<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<jakarta.ws.rs-version>2.1.6</jakarta.ws.rs-version>
{{/useJakartaEe}}
{{#openApiNullable}}
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#useSwaggerV3Annotations}}
<io.swagger.v3.annotations.version>2.2.21</io.swagger.v3.annotations.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.2.9</version>
<version>0.2.10</version>
</dependency>
{{/openApiNullable}}
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
{{^parentOverridden}}
<version>0.2.9</version>
<version>0.2.10</version>
{{/parentOverridden}}
</dependency>
{{/openApiNullable}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.2.9</version>
<version>0.2.10</version>
</dependency>
{{/openApiNullable}}
{{#lombok}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Do not edit the class manually.
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.2.9</version>
<version>0.2.10</version>
</dependency>
{{#swagger1AnnotationLibrary}}
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
{{#openApiNullable}}
<version.jackson.databind.nullable>0.2.9</version.jackson.databind.nullable>
<version.jackson.databind.nullable>0.2.10</version.jackson.databind.nullable>
{{/openApiNullable}}
</properties>

Expand Down
Loading
Loading