diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 5eaa5ffc9cfa..bf53ef9945e8 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -43,7 +43,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |library|library template (sub-template)|
**spring-boot**
Spring-boot Server application.
**spring-cloud**
Spring-Cloud-Feign client with Spring-Boot auto-configured settings.
**spring-declarative-http-interface**
Spring Declarative Interface client
|spring-boot| |modelMutable|Create mutable models| |false| |modelPackage|model package for generated code| |org.openapitools.model| -|openApiNullable|Enable OpenAPI Jackson Nullable library (jackson-databind-nullable) for optional + nullable properties (required: false, nullable: true). When enabled, such properties use JsonNullable<T> = JsonNullable.undefined() so callers can distinguish between a missing key and an explicitly provided null. Requires jackson-databind-nullable >= 0.2.10 when used with useJackson3.| |false| +|openApiNullable|Enable OpenAPI Jackson Nullable library (jackson-databind-nullable) for strict null handling. Controls how optional + non-nullable properties (required: false, nullable: false) handle explicit JSON null: when false (default), @JsonSetter(nulls = Nulls.SKIP) is used — explicit null is silently ignored (lenient, protects any default value from being overridden); when true, @JsonSetter(nulls = Nulls.FAIL) is used — explicit null causes deserialization to fail (strict, enforces the non-nullable contract, useful for PATCH semantics). Additionally, when true, optional + nullable properties (required: false, nullable: true) use JsonNullable<T> = JsonNullable.undefined() to distinguish between a missing key and an explicit null. Requires jackson-databind-nullable >= 0.2.10 when used with useJackson3.| |false| |packageName|Generated artifact package name.| |org.openapitools| |parcelizeModels|toggle "@Parcelize" for generated models| |null| |reactive|use coroutines for reactive behavior| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index dba07bae883e..b94c7c42d2bc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -313,10 +313,15 @@ public KotlinSpringServerCodegen() { cliOptions.add(CliOption.newBoolean(CodegenConstants.USE_DEDUCTION_FOR_ONE_OF_INTERFACES, CodegenConstants.USE_DEDUCTION_FOR_ONE_OF_INTERFACES_DESC, useDeductionForOneOfInterfaces)); addSwitch(CodegenConstants.USE_ENUM_VALUE_INTERFACE, CodegenConstants.USE_ENUM_VALUE_INTERFACE_DESC, useEnumValueInterface); addSwitch(CodegenConstants.OPENAPI_NULLABLE, - "Enable OpenAPI Jackson Nullable library (jackson-databind-nullable) for optional + nullable " - + "properties (required: false, nullable: true). When enabled, such properties use " - + "JsonNullable = JsonNullable.undefined() so callers can distinguish between a missing key " - + "and an explicitly provided null. Requires jackson-databind-nullable >= 0.2.10 when used with useJackson3.", + "Enable OpenAPI Jackson Nullable library (jackson-databind-nullable) for strict null handling. " + + "Controls how optional + non-nullable properties (required: false, nullable: false) handle explicit JSON null: " + + "when false (default), @JsonSetter(nulls = Nulls.SKIP) is used — explicit null is silently ignored " + + "(lenient, protects any default value from being overridden); " + + "when true, @JsonSetter(nulls = Nulls.FAIL) is used — explicit null causes deserialization to fail " + + "(strict, enforces the non-nullable contract, useful for PATCH semantics). " + + "Additionally, when true, optional + nullable properties (required: false, nullable: true) use " + + "JsonNullable = JsonNullable.undefined() to distinguish between a missing key and an explicit null. " + + "Requires jackson-databind-nullable >= 0.2.10 when used with useJackson3.", openApiNullable); supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application."); supportedLibraries.put(SPRING_CLOUD_LIBRARY, @@ -551,6 +556,7 @@ public void processOpts() { // Only jackson-databind moved to tools.jackson.databind in Jackson 3.x. importMapping.put("JsonSetter", "com.fasterxml.jackson.annotation.JsonSetter"); importMapping.put("Nulls", "com.fasterxml.jackson.annotation.Nulls"); + importMapping.put("JsonInclude", "com.fasterxml.jackson.annotation.JsonInclude"); // jackson-databind-nullable >= 0.2.10 supports both Jackson 2 and 3. importMapping.put("JsonNullable", "org.openapitools.jackson.nullable.JsonNullable"); // JsonDeserialize lives in jackson-databind which moved packages in Jackson 3.x. @@ -1266,12 +1272,20 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert property.example = null; } - // Scenario 3: optional + non-nullable → block explicit JSON nulls via @JsonSetter(nulls = Nulls.FAIL). - // Missing keys still succeed (default = null is used), but explicit {"field": null} fails deserialization. + // Scenario 3: optional + non-nullable → always emit @JsonSetter to handle explicit JSON nulls. + // When openApiNullable=true: Nulls.FAIL → reject explicit null (strict PATCH semantics). + // When openApiNullable=false: Nulls.SKIP → silently ignore explicit null (lenient, protects defaults). + // Always emit @JsonInclude(NON_NULL) so null fields are omitted from serialized output regardless + // of who is deserializing on the other end — closer to spec, avoids round-trip failures. if (!property.required && !property.isNullable) { - property.vendorExtensions.put("x-has-json-setter-nulls-fail", true); + if (openApiNullable) { + property.vendorExtensions.put("x-has-json-setter-nulls-fail", true); + } else { + property.vendorExtensions.put("x-has-json-setter-nulls-skip", true); + } model.imports.add("JsonSetter"); model.imports.add("Nulls"); + model.imports.add("JsonInclude"); } // Scenario 4: optional + nullable with openApiNullable → use JsonNullable = JsonNullable.undefined() @@ -1444,9 +1458,14 @@ public ModelsMap postProcessModelsEnum(ModelsMap objs) { for (ModelMap mo : objs.getModels()) { CodegenModel cm = mo.getModel(); for (CodegenProperty var : cm.optionalVars) { - // Scenario 3: optional + non-nullable → block explicit JSON nulls via @JsonSetter(nulls = Nulls.FAIL) + // Scenario 3: optional + non-nullable → always emit @JsonSetter and @JsonInclude(NON_NULL). + // openApiNullable=true: Nulls.FAIL (strict). openApiNullable=false: Nulls.SKIP (lenient). if (!var.required && !var.isNullable) { - var.vendorExtensions.put("x-has-json-setter-nulls-fail", true); + if (openApiNullable) { + var.vendorExtensions.put("x-has-json-setter-nulls-fail", true); + } else { + var.vendorExtensions.put("x-has-json-setter-nulls-skip", true); + } } // Scenario 4: optional + nullable with openApiNullable → use JsonNullable if (openApiNullable && !var.required && var.isNullable) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 2b362929953f..2104047f125c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -625,6 +625,10 @@ public void processOpts() { // override parent one importMapping.put("JsonDeserialize", (useJackson3 ? JACKSON3_PACKAGE : JACKSON2_PACKAGE) + ".databind.annotation.JsonDeserialize"); + // JsonSetter and Nulls always come from com.fasterxml.jackson.annotation regardless of Jackson 2 or 3 + // (Jackson 3.x intentionally keeps jackson-annotations at 2.x, same package) + importMapping.put("JsonSetter", "com.fasterxml.jackson.annotation.JsonSetter"); + importMapping.put("Nulls", "com.fasterxml.jackson.annotation.Nulls"); typeMapping.put("file", "org.springframework.core.io.Resource"); importMapping.put("Nullable", useJspecify? "org.jspecify.annotations.Nullable": "org.springframework.lang.Nullable"); @@ -1200,6 +1204,18 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert if (model.getVendorExtensions().containsKey("x-jackson-optional-nullable-helpers")) { model.imports.add("Arrays"); } + + // Optional + non-nullable: always emit @JsonInclude(NON_NULL) so null fields are omitted from + // serialized output regardless of who deserializes on the other end — closer to spec. + // When openApiNullable=false, also add @JsonSetter(nulls = Nulls.SKIP) on the setter. + if (!property.required && !property.isNullable) { + model.imports.add("JsonInclude"); + if (!openApiNullable) { + property.vendorExtensions.put("x-has-json-setter-nulls-skip", true); + model.imports.add("JsonSetter"); + model.imports.add("Nulls"); + } + } } @Override diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 43c075ac5d4a..6bb9480a8df4 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -61,6 +61,13 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{#vendorExtensions.x-field-extra-annotation}} {{{.}}} {{/vendorExtensions.x-field-extra-annotation}} + {{#jackson}} + {{^required}} + {{^isNullable}} + @JsonInclude(JsonInclude.Include.NON_NULL) + {{/isNullable}} + {{/required}} + {{/jackson}} {{#deprecated}} @Deprecated {{/deprecated}} @@ -242,6 +249,11 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{#vendorExtensions.x-setter-extra-annotation}} {{{vendorExtensions.x-setter-extra-annotation}}} {{/vendorExtensions.x-setter-extra-annotation}} + {{#jackson}} + {{#vendorExtensions.x-has-json-setter-nulls-skip}} + @JsonSetter(nulls = Nulls.SKIP) + {{/vendorExtensions.x-has-json-setter-nulls-skip}} + {{/jackson}} {{#deprecated}} @Deprecated {{/deprecated}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache index 404692bece79..bee9cfa44c62 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache @@ -2,6 +2,8 @@ @Schema({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{.}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}", {{/example}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}} @ApiModelProperty({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{.}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}", {{/example}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swagger1AnnotationLibrary}}{{#deprecated}} @Deprecated(message = ""){{/deprecated}}{{#vendorExtensions.x-field-extra-annotation}} - {{{.}}}{{/vendorExtensions.x-field-extra-annotation}}{{#vendorExtensions.x-has-json-setter-nulls-fail}} + {{{.}}}{{/vendorExtensions.x-field-extra-annotation}}{{^isNullable}} + @field:JsonInclude(JsonInclude.Include.NON_NULL){{/isNullable}}{{#vendorExtensions.x-has-json-setter-nulls-skip}} + @field:JsonSetter(nulls = Nulls.SKIP){{/vendorExtensions.x-has-json-setter-nulls-skip}}{{#vendorExtensions.x-has-json-setter-nulls-fail}} @field:JsonSetter(nulls = Nulls.FAIL){{/vendorExtensions.x-has-json-setter-nulls-fail}} @get:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#vendorExtensions.x-is-jackson-optional-nullable}}JsonNullable<{{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInPascalCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}>{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInPascalCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}?{{/vendorExtensions.x-is-jackson-optional-nullable}} = {{#vendorExtensions.x-is-jackson-optional-nullable}}JsonNullable.undefined(){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^defaultValue}}null{{/defaultValue}}{{#defaultValue}}{{^isNumber}}{{{defaultValue}}}{{/isNumber}}{{#isNumber}}{{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{/defaultValue}}{{/vendorExtensions.x-is-jackson-optional-nullable}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 1df1fb150ea8..27d8d11af7c8 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -6404,26 +6404,89 @@ public void requiredNullable_scenario2_requiredNullable() throws IOException { } /** - * Scenario 3: required=false, nullable=false - * Expected: nullable type with null default, AND @field:JsonSetter(nulls=Nulls.FAIL) to block explicit nulls. + * Scenario 3: required=false, nullable=false, no default, openApiNullable=false (default). + * Without openApiNullable, use lenient @JsonSetter(nulls = Nulls.SKIP) — silently ignores explicit null. + * Always emits @JsonInclude(NON_NULL) so null fields are omitted from serialized output. */ - @Test(description = "Scenario 3 – optional+non-nullable: null default with JsonSetter FAIL to block explicit nulls") + @Test(description = "Scenario 3 – optional+non-nullable, no openApiNullable: @JsonSetter(SKIP) + @JsonInclude(NON_NULL)") public void requiredNullable_scenario3_optionalNonNullable() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", new HashMap<>()); Path modelFile = files.get("TestModel.kt").toPath(); - // Must have @field:JsonSetter(nulls = Nulls.FAIL) annotation - assertFileContains(modelFile, "@field:JsonSetter(nulls = Nulls.FAIL)"); - // Must have JsonSetter and Nulls imports + String content = Files.readString(modelFile); + int idx = content.indexOf("val optionalNonNullable:"); + Assert.assertTrue(idx >= 0, "optionalNonNullable property must exist"); + String context = content.substring(Math.max(0, idx - 200), idx); + Assert.assertTrue(context.contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), + "optionalNonNullable must have @JsonInclude(NON_NULL) to omit null from serialized output"); + Assert.assertTrue(context.contains("@field:JsonSetter(nulls = Nulls.SKIP)"), + "optionalNonNullable (no openApiNullable) should have @field:JsonSetter(nulls = Nulls.SKIP)"); + Assert.assertFalse(context.contains("@field:JsonSetter(nulls = Nulls.FAIL)"), + "optionalNonNullable (no openApiNullable) must not have FAIL mode"); + // Must have JsonSetter, Nulls, and JsonInclude imports + assertFileContains(modelFile, + "import com.fasterxml.jackson.annotation.JsonInclude", + "import com.fasterxml.jackson.annotation.JsonSetter", + "import com.fasterxml.jackson.annotation.Nulls"); + // Must still be nullable type with null default + assertFileContains(modelFile, "val optionalNonNullable: kotlin.String? = null"); + } + + /** + * Scenario 3 with openApiNullable=true: required=false, nullable=false, no default. + * Uses strict @JsonSetter(nulls = Nulls.FAIL) and always emits @JsonInclude(NON_NULL). + */ + @Test(description = "Scenario 3 – optional+non-nullable with openApiNullable=true: @JsonSetter(FAIL) + @JsonInclude(NON_NULL)") + public void requiredNullable_scenario3_optionalNonNullable_withOpenApiNullable() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + + Path modelFile = files.get("TestModel.kt").toPath(); + String content = Files.readString(modelFile); + int idx = content.indexOf("val optionalNonNullable:"); + Assert.assertTrue(idx >= 0, "optionalNonNullable property must exist"); + String context = content.substring(Math.max(0, idx - 200), idx); + Assert.assertTrue(context.contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), + "optionalNonNullable must have @JsonInclude(NON_NULL) to omit null from serialized output"); + Assert.assertTrue(context.contains("@field:JsonSetter(nulls = Nulls.FAIL)"), + "optionalNonNullable should have @field:JsonSetter(FAIL) when openApiNullable=true"); + // Must have all three imports assertFileContains(modelFile, + "import com.fasterxml.jackson.annotation.JsonInclude", "import com.fasterxml.jackson.annotation.JsonSetter", "import com.fasterxml.jackson.annotation.Nulls"); // Must be nullable type with null default assertFileContains(modelFile, "val optionalNonNullable: kotlin.String? = null"); - // Must NOT be JsonNullable - assertFileNotContains(modelFile, "JsonNullable"); + } + + /** + * Scenario 3 with a defined default value: required=false, nullable=false, default="defaultValue", openApiNullable=false. + * Uses SKIP mode and @JsonInclude(NON_NULL) — null fields are omitted, protecting the default. + */ + @Test(description = "Scenario 3 – optional+non-nullable with default value: @JsonSetter(SKIP) + @JsonInclude(NON_NULL)") + public void requiredNullable_scenario3_optionalNonNullable_withDefault() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + new HashMap<>()); + + Path modelFile = files.get("TestModel.kt").toPath(); + String content = Files.readString(modelFile); + int idx = content.indexOf("val optionalNonNullableWithDefault:"); + Assert.assertTrue(idx >= 0, "optionalNonNullableWithDefault property must exist"); + String context = content.substring(Math.max(0, idx - 200), idx); + Assert.assertTrue(context.contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), + "optionalNonNullableWithDefault must have @JsonInclude(NON_NULL)"); + Assert.assertTrue(context.contains("@field:JsonSetter(nulls = Nulls.SKIP)"), + "optionalNonNullableWithDefault should have @field:JsonSetter(nulls = Nulls.SKIP) when openApiNullable=false"); + Assert.assertFalse(context.contains("@field:JsonSetter(nulls = Nulls.FAIL)"), + "optionalNonNullableWithDefault must not have FAIL mode when openApiNullable=false"); + assertFileContains(modelFile, + "import com.fasterxml.jackson.annotation.JsonInclude", + "import com.fasterxml.jackson.annotation.JsonSetter", + "import com.fasterxml.jackson.annotation.Nulls"); } /** @@ -6473,15 +6536,16 @@ public void requiredNullable_scenario4_optionalNullable_withOpenApiNullable() th } /** - * Scenario 3 with Jackson 3 (Spring Boot 4): optional + non-nullable. + * Scenario 3 with Jackson 3 (Spring Boot 4) + openApiNullable=true: optional + non-nullable. * * @JsonSetter / Nulls imports should come from com.fasterxml.jackson.annotation * (Jackson 3.x intentionally kept jackson-annotations at 2.x, same package). */ - @Test(description = "Scenario 3 with Jackson 3: com.fasterxml.jackson.annotation.JsonSetter + Nulls imports") + @Test(description = "Scenario 3 with Jackson 3 + openApiNullable: com.fasterxml.jackson.annotation.JsonSetter + Nulls imports") public void requiredNullable_scenario3_optionalNonNullable_withJackson3() throws IOException { Map props = new HashMap<>(); props.put(KotlinSpringServerCodegen.USE_SPRING_BOOT4, "true"); + props.put(CodegenConstants.OPENAPI_NULLABLE, "true"); Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", props); diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/required-nullable-4-states.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/required-nullable-4-states.yaml index 345bc97420b2..27764ccbc70b 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/required-nullable-4-states.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/required-nullable-4-states.yaml @@ -34,6 +34,11 @@ components: optionalNonNullable: type: string nullable: false + # Scenario 3 with default: required=false, nullable=false, default value set => null must be blocked + optionalNonNullableWithDefault: + type: string + nullable: false + default: "defaultValue" # Scenario 4: required=false, nullable=true => 3-state (JsonNullable) optionalNullable: type: string diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index cf99064121ac..67fe1bf75c8f 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -30,20 +31,27 @@ public class Pet { private String atType = "Pet"; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer age = 4; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean happy = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal price = new BigDecimal("32000000000"); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault())); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate dateOfBirth = LocalDate.parse("2021-01-01"); + @JsonInclude(JsonInclude.Include.NON_NULL) private LocalTime feedingTime = LocalTime.parse("10:15:30"); + @JsonInclude(JsonInclude.Include.NON_NULL) private LocalDateTime adoptionDate = LocalDateTime.parse("2007-12-03T10:15:30"); public Pet() { diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java index e8003223a642..94e4c4e3a37b 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -28,12 +29,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -74,8 +79,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java index 11fc03fbadf2..15f68e18aa1b 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,8 +30,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private JsonNullable name = JsonNullable.undefined(); @@ -38,6 +41,7 @@ public class Pet { @Deprecated private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -77,6 +81,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java index 545593defd13..8be6238a9d07 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java index f999fb3e2642..8641ef120e5f 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index deccf8e0ab0a..505ada269582 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 98e2dcdf0355..c8997d5532af 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index bacf79d2316b..231d2e9ac342 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index ef9f7c7ab60b..ba7ef3e9a6e4 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,26 +31,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index 81ab62dacd5b..2993f2735ab6 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index fde70f50bf62..add83c696111 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 8f805aa0e47a..d0338f31358b 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index cdcbf9bf47f3..52552567e55c 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AnimalDto.java index 5a7afd9a4c2b..84520f8ecb84 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class AnimalDto { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ApiResponseDto.java index 9e2e770f8fbd..d2512c6f9d16 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index fee252b348b4..b55377ec75fd 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index b2697ad882fa..3ffc2f670e42 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java index d638d35ec9fd..a8f2dcaeab37 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,10 +28,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/BigCatDto.java index d28c775d5a4e..46f92ddfe131 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/BigCatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -68,6 +69,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CapitalizationDto.java index 5da7a0e8571a..4843ba873301 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,16 +24,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CatDto.java index 95dac2c13972..f93f3d731155 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CategoryDto.java index ce099a3c9de1..186eced4d178 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 5eb7bc55e518..32327977d763 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -31,6 +32,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClassModelDto.java index 30b999fd63e2..98b54e67674b 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClientDto.java index edac5ad9d061..57a1ee7d5ada 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ClientDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/DogDto.java index 664903a55326..caa0250b598c 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/DogDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumArraysDto.java index 6eac97f8f0df..e8c957d86baf 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -62,6 +63,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -99,6 +101,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumTestDto.java index 09aa742da621..9e1454917a2c 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -62,6 +63,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -138,6 +140,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,8 +178,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileDto.java index a962181c22b5..7d4743b3139f 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 78a9ee3b13a3..4bc912945408 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,8 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FormatTestDto.java index 2ee8ac984332..f9e29a51f9aa 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,34 +30,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 28f0aebb97f8..575631117c91 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ListDto.java index 19a9b3dd9bf6..a26a9820eeda 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ListDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ListDto _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java index 82b8c8618b8e..94aea576523f 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -63,10 +65,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 1d56329176f0..bce02c00ecd4 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,11 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/Model200ResponseDto.java index cd4231b6d106..3402e30c0a96 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NameDto.java index 93ff3f5bfe5c..541f2d9d7f35 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public NameDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NumberOnlyDto.java index acd875347d6e..99874647b7f5 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OrderDto.java index 1d266cf921da..2468b7d09221 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OrderDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OuterCompositeDto.java index 15fe2d30c65a..99cee115400e 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 5e84f5f89c1d..8bc847f6ad63 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java index d8a6ef9f2404..a1a0114863c1 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -32,14 +33,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -79,6 +83,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index 9fc785f767f4..0f66b59f5d82 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index 57e724711d0a..134d3a5b90a7 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReturnDto.java index 34cceb1e0839..35d1ff348da7 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/SpecialModelNameDto.java index e26397394f14..9c164ad900df 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TagDto.java index 62a9d572cb64..a994721246a3 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TagDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/UserDto.java index 906aa23e46d4..68db549d9393 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/UserDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/XmlItemDto.java index e18300c514f4..e4b39f0ce6ab 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/XmlItemDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,62 +28,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 61a53d599b43..869ba866bee7 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index e11e0b81ef7a..2888755b4ae1 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index a1fcc9a129ea..5ab7cd790065 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index e56067c940d8..24e0f44fd37e 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index 922114ef2994..14197f63ca1f 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index b7c2061f50b4..0d50062ac404 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 667a788fa2a4..34b2a5ebfc07 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index 648474851897..34c6c77e3656 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AnimalDto.java index 9cf711de85b1..78b278d24964 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class AnimalDto { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ApiResponseDto.java index 00e741c6974b..df3f63520ed6 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index d8f588589a84..f889eb7508e4 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index f7655ddff7bb..eb030845f419 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayTestDto.java index c338d91e2544..5a2efc41458a 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java index 4881ebce02b9..7616c94f56bd 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CapitalizationDto.java index e7371061e2ba..65ef6ab364e2 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CatDto.java index e2c90e5ad8b1..02b056673d70 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -34,6 +35,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CategoryDto.java index 500fd7d2d7e3..7da84ffe372b 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 2c16a1a308a2..c66b10489209 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClassModelDto.java index 98984ba7c70b..4eb2d022976d 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClientDto.java index b2aee58b0f96..774a17cc893f 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ClientDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/DogDto.java index fb304c49f800..ac0184438a76 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/DogDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumArraysDto.java index 7b0c800ea08d..c740f8e648de 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumTestDto.java index ac2de1a26ad5..c4cfd16a63ce 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -61,6 +62,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -137,6 +139,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,8 +177,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileDto.java index c98f5027c543..167c69641deb 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 9a7e51730d07..4ee5238404fb 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FormatTestDto.java index a5e93372925f..a97ace671b86 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,34 +29,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index a04387f61a01..1f7ce14186b2 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ListDto.java index 40150aec3ea9..c9b4dfbb2308 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ListDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ListDto _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MapTestDto.java index a2d0962444a4..b8ce572131f8 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 11214166bab7..636d6818a128 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/Model200ResponseDto.java index 5e94d63d95a1..31670220a468 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NameDto.java index 0ae5565c52e1..5ecc3e271f17 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public NameDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NumberOnlyDto.java index 71a8b562c318..9064d426bc74 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OrderDto.java index 408a3df0de1b..044709a6ad82 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OrderDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OuterCompositeDto.java index 3b14ec151605..a8e4ff44c601 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java index e72d27d88f83..89eccb97bc6f 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -70,6 +71,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java index 2772f2e915e1..f5c8dacb8a90 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index 9a80fe4281a5..42ec3d45fb51 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index 17bf71f2af68..eaf9e1ed390b 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReturnDto.java index be4bf38df2ac..9ee16cfcbdc6 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelNameDto.java index f3e262b22e8c..3af905fa65c6 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TagDto.java index c7aa75c6204f..ffc7c8c88b38 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TagDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/UserDto.java index 3163459f2494..a7207b95a86c 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/UserDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/XmlItemDto.java index 70b4e216f76f..85b5d264b2b5 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/XmlItemDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) { diff --git a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/CategoryDto.java index 778297935481..1c6e0eb6aa77 100644 --- a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -21,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public CategoryDto id(@Nullable Long id) { @@ -40,6 +45,7 @@ public CategoryDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -60,6 +66,7 @@ public CategoryDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java index f2d70901d20a..f608d2adbeb9 100644 --- a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -27,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -74,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -96,6 +103,7 @@ public PetDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -116,6 +124,7 @@ public PetDto category(@Nullable CategoryDto category) { return category; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(@Nullable CategoryDto category) { this.category = category; @@ -192,6 +201,7 @@ public List getTags() { return tags; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List tags) { this.tags = tags; @@ -217,6 +227,7 @@ public PetDto status(@Nullable StatusEnum status) { /** * @deprecated */ + @JsonSetter(nulls = Nulls.SKIP) @Deprecated @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { diff --git a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/TagDto.java index 7a92e607bf69..28c3a7723ae0 100644 --- a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/TagDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.constraints.NotNull; @@ -21,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { @@ -40,6 +45,7 @@ public TagDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -60,6 +66,7 @@ public TagDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 65bd97f3dc26..a323c45db2fe 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index da0878de338d..d0621c321d0f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 7f74f8ca42c1..19dc68373bd3 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index f4d657ca508d..7dea5a59eb1d 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -28,26 +29,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 9f2483a3681f..c1a1f5887992 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index ed0bc85b6918..396d171e0669 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 268e9d3fd96f..7d3533d3efc2 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 4d8c90501e0f..419703104e86 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Animal.java index 50c26cc2c22a..86d1b7aa3a1a 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 152e1377ba1a..3dd7932d416c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index e7ef903c7fa6..0c522c9bcae9 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java index d21d01f9cfa8..53cf4ff8a1ad 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/BigCat.java index c15b20f749ee..1581a02f32a4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -66,6 +67,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Capitalization.java index 25044341e328..fc1ecd090ec6 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,16 +22,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Cat.java index b19eb8f0023e..593d781a5375 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -34,6 +35,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Category.java index 31229adcbcb0..a4484015f8f5 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ChildWithNullable.java index 902a3cbfa611..5ad00f7d6432 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ClassModel.java index 411e517d63d4..befefea2409e 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Client.java index d269be12eab6..8123c6105081 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Client.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Dog.java index 416bd36a2a88..cc6e15575170 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumArrays.java index d6e03eb08e6d..36be701b0240 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -60,6 +61,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -97,6 +99,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumTest.java index 842adc285ca6..4066212c96cd 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -62,6 +63,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -138,6 +140,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,8 +178,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/File.java index 53f67f89ca27..dae1190c138c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/File.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index dd1ac9f3983a..b646ade92e28 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FormatTest.java index 472cbaaef962..e07c5a757378 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,34 +30,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5fdcaa4e6bc2..446be3e118d0 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java index 5b5a36e533b1..71f870aa28f3 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -61,10 +63,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 07bea9cd9270..67cb7bf085c7 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -27,11 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Model200Response.java index 875f6032ef51..c7cd629a2ae5 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelApiResponse.java index f005811b5503..3902b3f0eb4b 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelList.java index 2d3653c0c237..e6b346d64a35 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelReturn.java index 65e9121957d6..a5cb8b9ff559 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Name.java index 4fc21108717e..dbbcc9d222a2 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Name.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,10 +24,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NumberOnly.java index fa9c0be0ca57..28d9100f77f4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Order.java index 50ba094ad0e7..249564f59259 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -24,12 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -70,8 +75,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/OuterComposite.java index 7d675e84494d..48983997208f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -22,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ParentWithNullable.java index 4c41ea7e8966..a445c551e91e 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -70,6 +71,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java index ed7e60b55cbb..4b5396aa7c12 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -30,14 +31,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -77,6 +81,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 9b8e551844ca..962341d9153b 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 8eca4f8bb39b..8cf00c40a3a4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,12 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/SpecialModelName.java index a22371897d4a..22807e865e48 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Tag.java index 45ca964cfd60..7fc810b52ca5 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/User.java index 5d0c0ae75c53..b787e6464bf2 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,20 +22,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/XmlItem.java index dbf65c44e5ba..adefd43550f7 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -25,62 +26,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 3a7ef737917d..c27857b4e39b 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index b120c4172dca..0cb585012e4a 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index a223e9565fbf..0ae26a16404d 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 1cf14d329f56..c10b7a082f14 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,26 +28,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c320eb766e50..64556b0652ed 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 575c79a553fb..720378a00b30 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 3594e3d8b3ac..ac795b6df569 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 1e5de3c50d70..c54cf4034340 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java index cbd6443d1975..69e1bf42e9e2 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index de6d699efa53..9d164051baf6 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 6631c06dae78..f8d5ef222970 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java index af9ee232dd81..27d16b2041ee 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java index d6b72affb9ff..9ccf06edc7ef 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -65,6 +66,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java index 514ad80d270f..12c4f024cbdd 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,16 +21,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java index 07df1b289821..f9d25b6f84d0 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -33,6 +34,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java index aebd4c8dddfa..26507e6bd931 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java index dba48209c89e..d1c4ec01b88c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java index 60dd8616ce79..781c25bf9230 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java index d63df554c9d8..f5539237f86d 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java index ade29cf77fc4..87d31395ac2f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java index 7bb31012611b..1db7fa390b4d 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -59,6 +60,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -96,6 +98,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java index be5efda9a072..5c2580745cd5 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -61,6 +62,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -137,6 +139,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,8 +177,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java index 1acaf93c41be..9c117538071d 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java index ed6da0349a31..607f31a830d0 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java index 510e1c72cb63..29c00c08ffe3 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,34 +29,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index af07422a3327..3d9b2e58fcc4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java index a75cc276d7e2..4b5e107d47a7 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -60,10 +62,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index f46d419ba008..350e8e774935 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -26,11 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java index dc0a97a1c864..a466a00726f7 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java index 9eb97294a6fe..48c71203d3f4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java index eba0d416bc43..b336ed95739c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java index b9bc4810c487..09c0786dccef 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java index 6d507449b532..7157cf953a76 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,10 +23,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java index a9d0e77cf128..b147940b0209 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -21,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java index cce9e6dba3cd..aa608e07ab95 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -69,8 +74,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java index c8dc4a68ba6b..50bb99384c28 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -21,10 +22,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java index f0cbcd0458de..30c57b59855e 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -69,6 +70,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java index d8ef18efa998..2025e9338898 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 1d86776a80c4..6d6b6b2e1ab4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,8 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index e9999d1051c3..256197e21ad5 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,12 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java index 847ece096edc..b298679679e2 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java index 439cf8750228..7efdb92c6605 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,8 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java index af5bcbc48c3f..e793512255bc 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,20 +21,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java index c8fec2ce273d..b98b96a88e2e 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -24,62 +25,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 3a7ef737917d..c27857b4e39b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index b120c4172dca..0cb585012e4a 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index a223e9565fbf..0ae26a16404d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 1cf14d329f56..c10b7a082f14 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,26 +28,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index c320eb766e50..64556b0652ed 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 575c79a553fb..720378a00b30 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 3594e3d8b3ac..ac795b6df569 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 1e5de3c50d70..c54cf4034340 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java index cbd6443d1975..69e1bf42e9e2 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index de6d699efa53..9d164051baf6 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 6631c06dae78..f8d5ef222970 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java index af9ee232dd81..27d16b2041ee 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java index d6b72affb9ff..9ccf06edc7ef 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -65,6 +66,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java index 514ad80d270f..12c4f024cbdd 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,16 +21,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java index 07df1b289821..f9d25b6f84d0 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -33,6 +34,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java index aebd4c8dddfa..26507e6bd931 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java index dba48209c89e..d1c4ec01b88c 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java index 60dd8616ce79..781c25bf9230 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java index d63df554c9d8..f5539237f86d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java index ade29cf77fc4..87d31395ac2f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java index 7bb31012611b..1db7fa390b4d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -59,6 +60,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -96,6 +98,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java index be5efda9a072..5c2580745cd5 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -61,6 +62,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -137,6 +139,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,8 +177,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java index 1acaf93c41be..9c117538071d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index ed6da0349a31..607f31a830d0 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java index 510e1c72cb63..29c00c08ffe3 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,34 +29,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index af07422a3327..3d9b2e58fcc4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java index a75cc276d7e2..4b5e107d47a7 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -60,10 +62,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index f46d419ba008..350e8e774935 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -26,11 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java index dc0a97a1c864..a466a00726f7 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index 9eb97294a6fe..48c71203d3f4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java index eba0d416bc43..b336ed95739c 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java index b9bc4810c487..09c0786dccef 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java index 6d507449b532..7157cf953a76 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,10 +23,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java index a9d0e77cf128..b147940b0209 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -21,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java index cce9e6dba3cd..aa608e07ab95 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -69,8 +74,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java index c8dc4a68ba6b..50bb99384c28 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -21,10 +22,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java index f0cbcd0458de..30c57b59855e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -69,6 +70,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java index d8ef18efa998..2025e9338898 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 1d86776a80c4..6d6b6b2e1ab4 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,8 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index e9999d1051c3..256197e21ad5 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,12 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index 847ece096edc..b298679679e2 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java index 439cf8750228..7efdb92c6605 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,8 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java index af5bcbc48c3f..e793512255bc 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -20,20 +21,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java index c8fec2ce273d..b98b96a88e2e 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -24,62 +25,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index b1950b354a9f..2fa06515ac9b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index df52ef370196..7e0f5bc3ff9c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.util.List; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -28,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { @@ -45,6 +49,7 @@ public AdditionalPropertiesArrayDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index e80dc99e3f7f..a998a2f6c5f9 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesBooleanDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index ece29baa640c..aec7297b42a0 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; @@ -27,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private @Nullable Object anytype2 = null; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { @@ -72,6 +85,7 @@ public Map getMapString() { return mapString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_string") public void setMapString(Map mapString) { this.mapString = mapString; @@ -100,6 +114,7 @@ public Map getMapNumber() { return mapNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_number") public void setMapNumber(Map mapNumber) { this.mapNumber = mapNumber; @@ -128,6 +143,7 @@ public Map getMapInteger() { return mapInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_integer") public void setMapInteger(Map mapInteger) { this.mapInteger = mapInteger; @@ -156,6 +172,7 @@ public Map getMapBoolean() { return mapBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_boolean") public void setMapBoolean(Map mapBoolean) { this.mapBoolean = mapBoolean; @@ -184,6 +201,7 @@ public Map> getMapArrayInteger() { return mapArrayInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_integer") public void setMapArrayInteger(Map> mapArrayInteger) { this.mapArrayInteger = mapArrayInteger; @@ -212,6 +230,7 @@ public Map> getMapArrayAnytype() { return mapArrayAnytype; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_anytype") public void setMapArrayAnytype(Map> mapArrayAnytype) { this.mapArrayAnytype = mapArrayAnytype; @@ -240,6 +259,7 @@ public Map> getMapMapString() { return mapMapString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_string") public void setMapMapString(Map> mapMapString) { this.mapMapString = mapMapString; @@ -268,6 +288,7 @@ public Map> getMapMapAnytype() { return mapMapAnytype; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_anytype") public void setMapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; @@ -288,6 +309,7 @@ public AdditionalPropertiesClassDto anytype1(@Nullable Object anytype1) { return anytype1; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("anytype_1") public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; @@ -328,6 +350,7 @@ public AdditionalPropertiesClassDto anytype3(@Nullable Object anytype3) { return anytype3; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("anytype_3") public void setAnytype3(@Nullable Object anytype3) { this.anytype3 = anytype3; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index 2cf1687c03b0..85fb1392e331 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesIntegerDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index 9e9922805fd6..5b03ce2be12b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -28,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { @@ -45,6 +49,7 @@ public AdditionalPropertiesNumberDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 1381c6e0966e..32334567b649 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.util.Map; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -28,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { @@ -45,6 +49,7 @@ public AdditionalPropertiesObjectDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index 3daf68bdf09b..09adbe30f3f2 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesStringDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java index e0bfb577de74..05ae334323ea 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,11 +3,14 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -38,6 +41,7 @@ public class AnimalDto { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { @@ -79,6 +83,7 @@ public String getColor() { return color; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("color") public void setColor(String color) { this.color = color; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java index f7b578d18919..8acae9cddfa3 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { @@ -44,6 +50,7 @@ public ApiResponseDto code(@Nullable Integer code) { return code; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") public void setCode(@Nullable Integer code) { this.code = code; @@ -64,6 +71,7 @@ public ApiResponseDto type(@Nullable String type) { return type; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(@Nullable String type) { this.type = type; @@ -84,6 +92,7 @@ public ApiResponseDto message(@Nullable String message) { return message; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("message") public void setMessage(@Nullable String message) { this.message = message; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index b8fdfb9ad74a..8b9b5165d1ff 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { @@ -52,6 +56,7 @@ public List> getArrayArrayNumber() { return arrayArrayNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("ArrayArrayNumber") public void setArrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index e6129f840195..26aec4b7323b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { @@ -52,6 +56,7 @@ public List getArrayNumber() { return arrayNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("ArrayNumber") public void setArrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java index 53693a03c036..5af1ccf4c0d3 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -27,10 +30,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { @@ -56,6 +62,7 @@ public List getArrayOfString() { return arrayOfString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_of_string") public void setArrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; @@ -84,6 +91,7 @@ public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_array_of_integer") public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { this.arrayArrayOfInteger = arrayArrayOfInteger; @@ -112,6 +120,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array return arrayArrayOfModel; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_array_of_model") public void setArrayArrayOfModel(List> arrayArrayOfModel) { this.arrayArrayOfModel = arrayArrayOfModel; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java index 531f5a750b88..4a04036b6f11 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java @@ -3,12 +3,15 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.CatDto; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -68,6 +71,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { @@ -89,6 +93,7 @@ public BigCatDto kind(@Nullable KindEnum kind) { return kind; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("kind") public void setKind(@Nullable KindEnum kind) { this.kind = kind; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java index 360672e9a91f..e8e4b315468a 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,16 +26,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { @@ -50,6 +59,7 @@ public CapitalizationDto smallCamel(@Nullable String smallCamel) { return smallCamel; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("smallCamel") public void setSmallCamel(@Nullable String smallCamel) { this.smallCamel = smallCamel; @@ -70,6 +80,7 @@ public CapitalizationDto capitalCamel(@Nullable String capitalCamel) { return capitalCamel; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("CapitalCamel") public void setCapitalCamel(@Nullable String capitalCamel) { this.capitalCamel = capitalCamel; @@ -90,6 +101,7 @@ public CapitalizationDto smallSnake(@Nullable String smallSnake) { return smallSnake; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("small_Snake") public void setSmallSnake(@Nullable String smallSnake) { this.smallSnake = smallSnake; @@ -110,6 +122,7 @@ public CapitalizationDto capitalSnake(@Nullable String capitalSnake) { return capitalSnake; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("Capital_Snake") public void setCapitalSnake(@Nullable String capitalSnake) { this.capitalSnake = capitalSnake; @@ -130,6 +143,7 @@ public CapitalizationDto scAETHFlowPoints(@Nullable String scAETHFlowPoints) { return scAETHFlowPoints; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("SCA_ETH_Flow_Points") public void setScAETHFlowPoints(@Nullable String scAETHFlowPoints) { this.scAETHFlowPoints = scAETHFlowPoints; @@ -150,6 +164,7 @@ public CapitalizationDto ATT_NAME(@Nullable String ATT_NAME) { return ATT_NAME; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("ATT_NAME") public void setATTNAME(@Nullable String ATT_NAME) { this.ATT_NAME = ATT_NAME; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java index 356e7952f1c2..60aa06a90f1e 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CatDto.java @@ -3,11 +3,14 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.AnimalDto; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -35,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { @@ -56,6 +60,7 @@ public CatDto declawed(@Nullable Boolean declawed) { return declawed; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("declawed") public void setDeclawed(@Nullable Boolean declawed) { this.declawed = declawed; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java index 8b6ba132191a..0ca50f4f0b34 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; @@ -46,6 +50,7 @@ public CategoryDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 877f1f15958f..f797a1a7e9a8 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,12 +3,15 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.ParentWithNullableDto; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -29,6 +32,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { @@ -46,6 +50,7 @@ public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { return otherProperty; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("otherProperty") public void setOtherProperty(@Nullable String otherProperty) { this.otherProperty = otherProperty; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java index 7dbfde0c5fe2..15c071da5904 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { @@ -40,6 +44,7 @@ public ClassModelDto propertyClass(@Nullable String propertyClass) { return propertyClass; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("_class") public void setPropertyClass(@Nullable String propertyClass) { this.propertyClass = propertyClass; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java index f1aa0202b735..3589438bbb62 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ClientDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { @@ -40,6 +44,7 @@ public ClientDto client(@Nullable String client) { return client; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("client") public void setClient(@Nullable String client) { this.client = client; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java index a7107d0e4962..3096d353e2a8 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/DogDto.java @@ -3,11 +3,14 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.AnimalDto; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -28,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { @@ -49,6 +53,7 @@ public DogDto breed(@Nullable String breed) { return breed; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("breed") public void setBreed(@Nullable String breed) { this.breed = breed; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java index 60d1c45d6f7e..b58674d43547 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -62,6 +65,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -99,6 +103,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { @@ -116,6 +121,7 @@ public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { return justSymbol; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("just_symbol") public void setJustSymbol(@Nullable JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; @@ -144,6 +150,7 @@ public List getArrayEnum() { return arrayEnum; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_enum") public void setArrayEnum(List arrayEnum) { this.arrayEnum = arrayEnum; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java index 5a28d98ec97d..d4da6bbf4cc4 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.OuterEnumDto; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -62,6 +65,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -138,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,8 +180,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { @@ -198,6 +205,7 @@ public EnumTestDto enumString(@Nullable EnumStringEnum enumString) { return enumString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_string") public void setEnumString(@Nullable EnumStringEnum enumString) { this.enumString = enumString; @@ -238,6 +246,7 @@ public EnumTestDto enumInteger(@Nullable EnumIntegerEnum enumInteger) { return enumInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_integer") public void setEnumInteger(@Nullable EnumIntegerEnum enumInteger) { this.enumInteger = enumInteger; @@ -258,6 +267,7 @@ public EnumTestDto enumNumber(@Nullable EnumNumberEnum enumNumber) { return enumNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_number") public void setEnumNumber(@Nullable EnumNumberEnum enumNumber) { this.enumNumber = enumNumber; @@ -278,6 +288,7 @@ public EnumTestDto outerEnum(@Nullable OuterEnumDto outerEnum) { return outerEnum; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("outerEnum") public void setOuterEnum(@Nullable OuterEnumDto outerEnum) { this.outerEnum = outerEnum; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java index acc8ed785d0c..6769dd907491 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { @@ -40,6 +44,7 @@ public FileDto sourceURI(@Nullable String sourceURI) { return sourceURI; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("sourceURI") public void setSourceURI(@Nullable String sourceURI) { this.sourceURI = sourceURI; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 25cbe9448782..a301e7260053 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -27,8 +30,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { @@ -46,6 +51,7 @@ public FileSchemaTestClassDto file(@Nullable FileDto file) { return file; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("file") public void setFile(@Nullable FileDto file) { this.file = file; @@ -74,6 +80,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { return files; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("files") public void setFiles(List<@Valid FileDto> files) { this.files = files; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java index d219a202bcc5..23d8598b23f8 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.time.LocalDate; import java.time.OffsetDateTime; @@ -29,34 +32,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { @@ -80,6 +93,7 @@ public FormatTestDto integer(@Nullable Integer integer) { return integer; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("integer") public void setInteger(@Nullable Integer integer) { this.integer = integer; @@ -102,6 +116,7 @@ public FormatTestDto int32(@Nullable Integer int32) { return int32; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int32") public void setInt32(@Nullable Integer int32) { this.int32 = int32; @@ -122,6 +137,7 @@ public FormatTestDto int64(@Nullable Long int64) { return int64; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int64") public void setInt64(@Nullable Long int64) { this.int64 = int64; @@ -166,6 +182,7 @@ public FormatTestDto _float(@Nullable Float _float) { return _float; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("float") public void setFloat(@Nullable Float _float) { this._float = _float; @@ -188,6 +205,7 @@ public FormatTestDto _double(@Nullable Double _double) { return _double; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("double") public void setDouble(@Nullable Double _double) { this._double = _double; @@ -208,6 +226,7 @@ public FormatTestDto string(@Nullable String string) { return string; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("string") public void setString(@Nullable String string) { this.string = string; @@ -248,6 +267,7 @@ public FormatTestDto binary(@Nullable org.springframework.core.io.Resource binar return binary; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("binary") public void setBinary(@Nullable org.springframework.core.io.Resource binary) { this.binary = binary; @@ -288,6 +308,7 @@ public FormatTestDto dateTime(@Nullable OffsetDateTime dateTime) { return dateTime; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -308,6 +329,7 @@ public FormatTestDto uuid(@Nullable UUID uuid) { return uuid; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -348,6 +370,7 @@ public FormatTestDto bigDecimal(@Nullable BigDecimal bigDecimal) { return bigDecimal; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("BigDecimal") public void setBigDecimal(@Nullable BigDecimal bigDecimal) { this.bigDecimal = bigDecimal; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 4c2b20894ee1..2c12df469141 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { @@ -42,6 +47,7 @@ public HasOnlyReadOnlyDto bar(@Nullable String bar) { return bar; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -62,6 +68,7 @@ public HasOnlyReadOnlyDto foo(@Nullable String foo) { return foo; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("foo") public void setFoo(@Nullable String foo) { this.foo = foo; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java index 9d07f2456726..ac5da5d55c2e 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ListDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ListDto _123list(@Nullable String _123list) { @@ -40,6 +44,7 @@ public ListDto _123list(@Nullable String _123list) { return _123list; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("123-list") public void set123list(@Nullable String _123list) { this._123list = _123list; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java index 93df133d72c7..c35ea1ee7747 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.HashMap; import java.util.Map; import org.springframework.lang.Nullable; @@ -26,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -63,10 +67,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { @@ -92,6 +99,7 @@ public Map> getMapMapOfString() { return mapMapOfString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_of_string") public void setMapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; @@ -120,6 +128,7 @@ public Map getMapOfEnumString() { return mapOfEnumString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_of_enum_string") public void setMapOfEnumString(Map mapOfEnumString) { this.mapOfEnumString = mapOfEnumString; @@ -148,6 +157,7 @@ public Map getDirectMap() { return directMap; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("direct_map") public void setDirectMap(Map directMap) { this.directMap = directMap; @@ -176,6 +186,7 @@ public Map getIndirectMap() { return indirectMap; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("indirect_map") public void setIndirectMap(Map indirectMap) { this.indirectMap = indirectMap; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 986ee2aa89ca..e08e0980357c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.time.OffsetDateTime; import java.util.HashMap; import java.util.Map; @@ -29,11 +32,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { @@ -51,6 +57,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) return uuid; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -71,6 +78,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(@Nullable OffsetD return dateTime; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -99,6 +107,7 @@ public Map getMap() { return map; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map") public void setMap(Map map) { this.map = map; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java index 0cb373423e39..331c7d2074bc 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { @@ -42,6 +47,7 @@ public Model200ResponseDto name(@Nullable Integer name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable Integer name) { this.name = name; @@ -62,6 +68,7 @@ public Model200ResponseDto propertyClass(@Nullable String propertyClass) { return propertyClass; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("class") public void setPropertyClass(@Nullable String propertyClass) { this.propertyClass = propertyClass; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java index 8a067a576314..913a1c4de8e7 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NameDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -25,10 +28,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public NameDto() { @@ -70,6 +76,7 @@ public NameDto snakeCase(@Nullable Integer snakeCase) { return snakeCase; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("snake_case") public void setSnakeCase(@Nullable Integer snakeCase) { this.snakeCase = snakeCase; @@ -90,6 +97,7 @@ public NameDto property(@Nullable String property) { return property; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("property") public void setProperty(@Nullable String property) { this.property = property; @@ -110,6 +118,7 @@ public NameDto _123number(@Nullable Integer _123number) { return _123number; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("123Number") public void set123number(@Nullable Integer _123number) { this._123number = _123number; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java index fbfdb5aeda84..f0a524765631 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -24,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { @@ -41,6 +45,7 @@ public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { return justNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("JustNumber") public void setJustNumber(@Nullable BigDecimal justNumber) { this.justNumber = justNumber; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java index b46be67ae18f..fe1d0e04a88b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OrderDto.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; @@ -26,12 +29,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +79,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { @@ -91,6 +100,7 @@ public OrderDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -111,6 +121,7 @@ public OrderDto petId(@Nullable Long petId) { return petId; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") public void setPetId(@Nullable Long petId) { this.petId = petId; @@ -131,6 +142,7 @@ public OrderDto quantity(@Nullable Integer quantity) { return quantity; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") public void setQuantity(@Nullable Integer quantity) { this.quantity = quantity; @@ -151,6 +163,7 @@ public OrderDto shipDate(@Nullable OffsetDateTime shipDate) { return shipDate; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") public void setShipDate(@Nullable OffsetDateTime shipDate) { this.shipDate = shipDate; @@ -171,6 +184,7 @@ public OrderDto status(@Nullable StatusEnum status) { return status; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { this.status = status; @@ -191,6 +205,7 @@ public Boolean getComplete() { return complete; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("complete") public void setComplete(Boolean complete) { this.complete = complete; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java index 8fcae981fb1e..28c9b4910f6c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -24,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { @@ -45,6 +51,7 @@ public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { return myNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_number") public void setMyNumber(@Nullable BigDecimal myNumber) { this.myNumber = myNumber; @@ -65,6 +72,7 @@ public OuterCompositeDto myString(@Nullable String myString) { return myString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_string") public void setMyString(@Nullable String myString) { this.myString = myString; @@ -85,6 +93,7 @@ public OuterCompositeDto myBoolean(@Nullable Boolean myBoolean) { return myBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_boolean") public void setMyBoolean(@Nullable Boolean myBoolean) { this.myBoolean = myBoolean; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 6c34a60c08c1..3c470b7da263 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,12 +3,15 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -68,6 +71,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private @Nullable String nullableProperty = null; @@ -87,6 +91,7 @@ public ParentWithNullableDto type(@Nullable TypeEnum type) { return type; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(@Nullable TypeEnum type) { this.type = type; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java index 9197aaa9c612..ad7e70544e93 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; @@ -32,14 +35,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -79,6 +85,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -101,6 +108,7 @@ public PetDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -121,6 +129,7 @@ public PetDto category(@Nullable CategoryDto category) { return category; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(@Nullable CategoryDto category) { this.category = category; @@ -198,6 +207,7 @@ public PetDto addTagsItem(TagDto tagsItem) { return tags; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List<@Valid TagDto> tags) { this.tags = tags; @@ -223,6 +233,7 @@ public PetDto status(@Nullable StatusEnum status) { /** * @deprecated */ + @JsonSetter(nulls = Nulls.SKIP) @Deprecated @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index d5b2bc0931af..3ff7bae09747 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { @@ -42,6 +47,7 @@ public ReadOnlyFirstDto bar(@Nullable String bar) { return bar; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -62,6 +68,7 @@ public ReadOnlyFirstDto baz(@Nullable String baz) { return baz; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("baz") public void setBaz(@Nullable String baz) { this.baz = baz; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index e68b5530e9da..e016b0cbf53b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { @@ -46,6 +53,7 @@ public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable Str return normalPropertyName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("normalPropertyName") public void setNormalPropertyName(@Nullable String normalPropertyName) { this.normalPropertyName = normalPropertyName; @@ -66,6 +74,7 @@ public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(@Nulla return UPPER_CASE_PROPERTY_SNAKE; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") public void setUPPERCASEPROPERTYSNAKE(@Nullable String UPPER_CASE_PROPERTY_SNAKE) { this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; @@ -86,6 +95,7 @@ public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(@Nullabl return lowerCasePropertyDashes; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lower-case-property-dashes") public void setLowerCasePropertyDashes(@Nullable String lowerCasePropertyDashes) { this.lowerCasePropertyDashes = lowerCasePropertyDashes; @@ -106,6 +116,7 @@ public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(@Nullable return propertyNameWithSpaces; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("property name with spaces") public void setPropertyNameWithSpaces(@Nullable String propertyNameWithSpaces) { this.propertyNameWithSpaces = propertyNameWithSpaces; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java index 64a96543d17b..c5cbf6abbede 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { @@ -40,6 +44,7 @@ public ReturnDto _return(@Nullable Integer _return) { return _return; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("return") public void setReturn(@Nullable Integer _return) { this._return = _return; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java index d8ffa35132e1..b647b0d1f647 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(@Nullable Long $specialPropertyName) { @@ -40,6 +44,7 @@ public class SpecialModelNameDto { return $specialPropertyName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("$special[property.name]") public void set$SpecialPropertyName(@Nullable Long $specialPropertyName) { this.$specialPropertyName = $specialPropertyName; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java index 4ed403d29ca7..8303430dcfdd 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TagDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { @@ -42,6 +47,7 @@ public TagDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -62,6 +68,7 @@ public TagDto name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java index 76779407ae77..ed15c89d27cd 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/UserDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,20 +26,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { @@ -54,6 +65,7 @@ public UserDto id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -74,6 +86,7 @@ public UserDto username(@Nullable String username) { return username; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") public void setUsername(@Nullable String username) { this.username = username; @@ -94,6 +107,7 @@ public UserDto firstName(@Nullable String firstName) { return firstName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") public void setFirstName(@Nullable String firstName) { this.firstName = firstName; @@ -114,6 +128,7 @@ public UserDto lastName(@Nullable String lastName) { return lastName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") public void setLastName(@Nullable String lastName) { this.lastName = lastName; @@ -134,6 +149,7 @@ public UserDto email(@Nullable String email) { return email; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") public void setEmail(@Nullable String email) { this.email = email; @@ -154,6 +170,7 @@ public UserDto password(@Nullable String password) { return password; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") public void setPassword(@Nullable String password) { this.password = password; @@ -174,6 +191,7 @@ public UserDto phone(@Nullable String phone) { return phone; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") public void setPhone(@Nullable String phone) { this.phone = phone; @@ -194,6 +212,7 @@ public UserDto userStatus(@Nullable Integer userStatus) { return userStatus; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("userStatus") public void setUserStatus(@Nullable Integer userStatus) { this.userStatus = userStatus; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java index f0025e8690c2..79015d7499c0 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/XmlItemDto.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -27,62 +30,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) { @@ -100,6 +132,7 @@ public XmlItemDto attributeString(@Nullable String attributeString) { return attributeString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_string") public void setAttributeString(@Nullable String attributeString) { this.attributeString = attributeString; @@ -120,6 +153,7 @@ public XmlItemDto attributeNumber(@Nullable BigDecimal attributeNumber) { return attributeNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_number") public void setAttributeNumber(@Nullable BigDecimal attributeNumber) { this.attributeNumber = attributeNumber; @@ -140,6 +174,7 @@ public XmlItemDto attributeInteger(@Nullable Integer attributeInteger) { return attributeInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_integer") public void setAttributeInteger(@Nullable Integer attributeInteger) { this.attributeInteger = attributeInteger; @@ -160,6 +195,7 @@ public XmlItemDto attributeBoolean(@Nullable Boolean attributeBoolean) { return attributeBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_boolean") public void setAttributeBoolean(@Nullable Boolean attributeBoolean) { this.attributeBoolean = attributeBoolean; @@ -188,6 +224,7 @@ public List getWrappedArray() { return wrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("wrapped_array") public void setWrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; @@ -208,6 +245,7 @@ public XmlItemDto nameString(@Nullable String nameString) { return nameString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_string") public void setNameString(@Nullable String nameString) { this.nameString = nameString; @@ -228,6 +266,7 @@ public XmlItemDto nameNumber(@Nullable BigDecimal nameNumber) { return nameNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_number") public void setNameNumber(@Nullable BigDecimal nameNumber) { this.nameNumber = nameNumber; @@ -248,6 +287,7 @@ public XmlItemDto nameInteger(@Nullable Integer nameInteger) { return nameInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_integer") public void setNameInteger(@Nullable Integer nameInteger) { this.nameInteger = nameInteger; @@ -268,6 +308,7 @@ public XmlItemDto nameBoolean(@Nullable Boolean nameBoolean) { return nameBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_boolean") public void setNameBoolean(@Nullable Boolean nameBoolean) { this.nameBoolean = nameBoolean; @@ -296,6 +337,7 @@ public List getNameArray() { return nameArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_array") public void setNameArray(List nameArray) { this.nameArray = nameArray; @@ -324,6 +366,7 @@ public List getNameWrappedArray() { return nameWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_wrapped_array") public void setNameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; @@ -344,6 +387,7 @@ public XmlItemDto prefixString(@Nullable String prefixString) { return prefixString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_string") public void setPrefixString(@Nullable String prefixString) { this.prefixString = prefixString; @@ -364,6 +408,7 @@ public XmlItemDto prefixNumber(@Nullable BigDecimal prefixNumber) { return prefixNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_number") public void setPrefixNumber(@Nullable BigDecimal prefixNumber) { this.prefixNumber = prefixNumber; @@ -384,6 +429,7 @@ public XmlItemDto prefixInteger(@Nullable Integer prefixInteger) { return prefixInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_integer") public void setPrefixInteger(@Nullable Integer prefixInteger) { this.prefixInteger = prefixInteger; @@ -404,6 +450,7 @@ public XmlItemDto prefixBoolean(@Nullable Boolean prefixBoolean) { return prefixBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_boolean") public void setPrefixBoolean(@Nullable Boolean prefixBoolean) { this.prefixBoolean = prefixBoolean; @@ -432,6 +479,7 @@ public List getPrefixArray() { return prefixArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_array") public void setPrefixArray(List prefixArray) { this.prefixArray = prefixArray; @@ -460,6 +508,7 @@ public List getPrefixWrappedArray() { return prefixWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_wrapped_array") public void setPrefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; @@ -480,6 +529,7 @@ public XmlItemDto namespaceString(@Nullable String namespaceString) { return namespaceString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_string") public void setNamespaceString(@Nullable String namespaceString) { this.namespaceString = namespaceString; @@ -500,6 +550,7 @@ public XmlItemDto namespaceNumber(@Nullable BigDecimal namespaceNumber) { return namespaceNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_number") public void setNamespaceNumber(@Nullable BigDecimal namespaceNumber) { this.namespaceNumber = namespaceNumber; @@ -520,6 +571,7 @@ public XmlItemDto namespaceInteger(@Nullable Integer namespaceInteger) { return namespaceInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_integer") public void setNamespaceInteger(@Nullable Integer namespaceInteger) { this.namespaceInteger = namespaceInteger; @@ -540,6 +592,7 @@ public XmlItemDto namespaceBoolean(@Nullable Boolean namespaceBoolean) { return namespaceBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_boolean") public void setNamespaceBoolean(@Nullable Boolean namespaceBoolean) { this.namespaceBoolean = namespaceBoolean; @@ -568,6 +621,7 @@ public List getNamespaceArray() { return namespaceArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_array") public void setNamespaceArray(List namespaceArray) { this.namespaceArray = namespaceArray; @@ -596,6 +650,7 @@ public List getNamespaceWrappedArray() { return namespaceWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_wrapped_array") public void setNamespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; @@ -616,6 +671,7 @@ public XmlItemDto prefixNsString(@Nullable String prefixNsString) { return prefixNsString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_string") public void setPrefixNsString(@Nullable String prefixNsString) { this.prefixNsString = prefixNsString; @@ -636,6 +692,7 @@ public XmlItemDto prefixNsNumber(@Nullable BigDecimal prefixNsNumber) { return prefixNsNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_number") public void setPrefixNsNumber(@Nullable BigDecimal prefixNsNumber) { this.prefixNsNumber = prefixNsNumber; @@ -656,6 +713,7 @@ public XmlItemDto prefixNsInteger(@Nullable Integer prefixNsInteger) { return prefixNsInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_integer") public void setPrefixNsInteger(@Nullable Integer prefixNsInteger) { this.prefixNsInteger = prefixNsInteger; @@ -676,6 +734,7 @@ public XmlItemDto prefixNsBoolean(@Nullable Boolean prefixNsBoolean) { return prefixNsBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_boolean") public void setPrefixNsBoolean(@Nullable Boolean prefixNsBoolean) { this.prefixNsBoolean = prefixNsBoolean; @@ -704,6 +763,7 @@ public List getPrefixNsArray() { return prefixNsArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_array") public void setPrefixNsArray(List prefixNsArray) { this.prefixNsArray = prefixNsArray; @@ -732,6 +792,7 @@ public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_wrapped_array") public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { this.prefixNsWrappedArray = prefixNsWrappedArray; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 67b083526049..0206ea687691 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 8278d25d4079..9ecc8e839311 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index fb95bf4671d3..1a35a7cb2d20 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 76a621835017..d3616c866666 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index d7a6be4c5f00..9f295d184656 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index ebe243823366..9d68b0732761 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index d7f7318e7a44..c0308d775614 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 3f7444fbd474..200945254446 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Animal.java index f019a7490be9..014311c1a165 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Animal.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index dbe769de0d47..b4e5926e9526 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 07476f79f07d..b5eb994baba0 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java index 362cb7aaecdf..9fea23d5e6de 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java index 09cf21060e2a..95043f2999b7 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Capitalization.java index f3842f8f84d6..59fe223fc7f1 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Cat.java index a5b880b73276..f28d9068e208 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Cat.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Category.java index 62fabb61e3f7..70e01e7bf2c0 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java index 3c1d41712571..d43b5faacffa 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ClassModel.java index ed62ab3813ed..6247e9f7e5d7 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Client.java index c127b046efc9..12a2bd428725 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Client.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Dog.java index bcbe530fdda7..57a46ad26a0a 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Dog.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumArrays.java index 3755308110ff..1113b90e030d 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumTest.java index f176afb30976..98a81057fd03 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/File.java index b3df0a78ff12..0c8e27020edd 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/File.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java index ca2f1efab227..ff7fba693b71 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FormatTest.java index 8b5100d3dfe4..2fb983676b8d 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index a9beb21764f3..c597e9ef6a78 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java index d0565edebd0f..f5144e3fcb3e 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index f3478ef5fad3..a19a37106f3e 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Model200Response.java index 107cbe078acc..25cdfc18ef6c 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelApiResponse.java index 37029d4a04cf..b760a68359c2 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelList.java index 27fa9b99be93..f277f2b70586 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelReturn.java index 942137a4803e..0e65b07b9da3 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Name.java index 5625fd9b5421..f75b27126371 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Name.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,10 +25,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NumberOnly.java index c1c2b0aa9866..f024d4467b4b 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Order.java index f2815b771a85..dd41160b9397 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/OuterComposite.java index 33d8d8dfa207..771fdaeaaaf2 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java index 425f7dd6839a..fe94e35238c7 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java index 6d4904c3b3a5..9d354054042e 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 2cab9f1d3cb7..d484cf41d0ad 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 4c30d8dafbc0..726c2f517a45 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/SpecialModelName.java index 807337770409..9736276213e9 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Tag.java index eb4891d929fe..4af42d2cbb12 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/User.java index f472eb56ca20..6b7527acb1d1 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/User.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/XmlItem.java index addc24fd20b4..fc8437842b5c 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 61a53d599b43..869ba866bee7 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index e11e0b81ef7a..2888755b4ae1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index a1fcc9a129ea..5ab7cd790065 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index e56067c940d8..24e0f44fd37e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index 922114ef2994..14197f63ca1f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index b7c2061f50b4..0d50062ac404 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 667a788fa2a4..34b2a5ebfc07 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index 648474851897..34c6c77e3656 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java index 9cf711de85b1..78b278d24964 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class AnimalDto { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java index 00e741c6974b..df3f63520ed6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index d8f588589a84..f889eb7508e4 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index f7655ddff7bb..eb030845f419 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java index c338d91e2544..5a2efc41458a 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java index 4881ebce02b9..7616c94f56bd 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java index e7371061e2ba..65ef6ab364e2 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java index e2c90e5ad8b1..02b056673d70 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -34,6 +35,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java index 500fd7d2d7e3..7da84ffe372b 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 2c16a1a308a2..c66b10489209 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java index 98984ba7c70b..4eb2d022976d 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java index b2aee58b0f96..774a17cc893f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java index fb304c49f800..ac0184438a76 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java index 7b0c800ea08d..c740f8e648de 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java index ac2de1a26ad5..c4cfd16a63ce 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -61,6 +62,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -137,6 +139,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,8 +177,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java index c98f5027c543..167c69641deb 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 9a7e51730d07..4ee5238404fb 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java index a5e93372925f..a97ace671b86 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,34 +29,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index a04387f61a01..1f7ce14186b2 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java index 40150aec3ea9..c9b4dfbb2308 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ListDto _123list(@Nullable String _123list) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java index a2d0962444a4..b8ce572131f8 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 11214166bab7..636d6818a128 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java index 5e94d63d95a1..31670220a468 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java index 0ae5565c52e1..5ecc3e271f17 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public NameDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java index 71a8b562c318..9064d426bc74 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java index 408a3df0de1b..044709a6ad82 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java index 3b14ec151605..a8e4ff44c601 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java index e72d27d88f83..89eccb97bc6f 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -70,6 +71,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java index 2772f2e915e1..f5c8dacb8a90 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index 9a80fe4281a5..42ec3d45fb51 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index 17bf71f2af68..eaf9e1ed390b 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java index be4bf38df2ac..9ee16cfcbdc6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java index f3e262b22e8c..3af905fa65c6 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java index c7aa75c6204f..ffc7c8c88b38 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java index 3163459f2494..a7207b95a86c 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java index 70b4e216f76f..85b5d264b2b5 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java index 0686bb84be20..90709166364c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") String> name = Optional.empty(); public Category id(Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java index b7477072bbb0..492161e510c9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional code = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional type = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional message = Optional.empty(); public ModelApiResponse code(Integer code) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java index 60cd089e1283..c61fd2bafa7f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -24,12 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional petId = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional quantity = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Optional shipDate = Optional.empty(); @@ -70,8 +75,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional status = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional complete = Optional.of(false); public Order id(Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java index 47d22c1ff5cd..3dd01266ef31 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -27,14 +28,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional category = Optional.empty(); private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -74,6 +78,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private Optional status = Optional.empty(); diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java index 59384011a824..e74cd6b9c634 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public Tag id(Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java index badaf9df87c8..77c21fa1cf42 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,20 +22,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional username = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional firstName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional lastName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional email = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional password = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional phone = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional userStatus = Optional.empty(); public User id(Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java index 4a6f9ff4289f..24d4b561ef1e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -20,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; public Category id(Long id) { @@ -39,6 +44,7 @@ public Long getId() { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -59,6 +65,7 @@ public String getName() { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(String name) { this.name = name; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java index b8b7471a0fc1..948b8dba4f48 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -22,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private String message; public ModelApiResponse code(Integer code) { @@ -43,6 +49,7 @@ public Integer getCode() { return code; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") public void setCode(Integer code) { this.code = code; @@ -63,6 +70,7 @@ public String getType() { return type; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(String type) { this.type = type; @@ -83,6 +91,7 @@ public String getMessage() { return message; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("message") public void setMessage(String message) { this.message = message; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java index d7e2cc88fca6..8ca1a1dbf248 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; @@ -23,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -69,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(Long id) { @@ -88,6 +97,7 @@ public Long getId() { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -108,6 +118,7 @@ public Long getPetId() { return petId; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") public void setPetId(Long petId) { this.petId = petId; @@ -128,6 +139,7 @@ public Integer getQuantity() { return quantity; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") public void setQuantity(Integer quantity) { this.quantity = quantity; @@ -148,6 +160,7 @@ public OffsetDateTime getShipDate() { return shipDate; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") public void setShipDate(OffsetDateTime shipDate) { this.shipDate = shipDate; @@ -168,6 +181,7 @@ public StatusEnum getStatus() { return status; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") public void setStatus(StatusEnum status) { this.status = status; @@ -188,6 +202,7 @@ public Boolean getComplete() { return complete; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("complete") public void setComplete(Boolean complete) { this.complete = complete; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java index ead556b828ae..e61d01ffc2a8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -26,14 +29,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -73,6 +79,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private StatusEnum status; @@ -103,6 +110,7 @@ public Long getId() { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -123,6 +131,7 @@ public Category getCategory() { return category; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(Category category) { this.category = category; @@ -199,6 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { return tags; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List<@Valid Tag> tags) { this.tags = tags; @@ -224,6 +234,7 @@ public StatusEnum getStatus() { /** * @deprecated */ + @JsonSetter(nulls = Nulls.SKIP) @Deprecated @JsonProperty("status") public void setStatus(StatusEnum status) { diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java index b6463666696d..437a67c3a834 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -20,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; public Tag id(Long id) { @@ -39,6 +44,7 @@ public Long getId() { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -59,6 +65,7 @@ public String getName() { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(String name) { this.name = name; diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java index faf7def0bb22..520aa7a307bc 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -20,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer userStatus; public User id(Long id) { @@ -51,6 +62,7 @@ public Long getId() { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -71,6 +83,7 @@ public String getUsername() { return username; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") public void setUsername(String username) { this.username = username; @@ -91,6 +104,7 @@ public String getFirstName() { return firstName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") public void setFirstName(String firstName) { this.firstName = firstName; @@ -111,6 +125,7 @@ public String getLastName() { return lastName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") public void setLastName(String lastName) { this.lastName = lastName; @@ -131,6 +146,7 @@ public String getEmail() { return email; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") public void setEmail(String email) { this.email = email; @@ -151,6 +167,7 @@ public String getPassword() { return password; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") public void setPassword(String password) { this.password = password; @@ -171,6 +188,7 @@ public String getPhone() { return phone; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") public void setPhone(String phone) { this.phone = phone; @@ -191,6 +209,7 @@ public Integer getUserStatus() { return userStatus; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("userStatus") public void setUserStatus(Integer userStatus) { this.userStatus = userStatus; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java index cf99064121ac..67fe1bf75c8f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -30,20 +31,27 @@ public class Pet { private String atType = "Pet"; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer age = 4; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean happy = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal price = new BigDecimal("32000000000"); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault())); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate dateOfBirth = LocalDate.parse("2021-01-01"); + @JsonInclude(JsonInclude.Include.NON_NULL) private LocalTime feedingTime = LocalTime.parse("10:15:30"); + @JsonInclude(JsonInclude.Include.NON_NULL) private LocalDateTime adoptionDate = LocalDateTime.parse("2007-12-03T10:15:30"); public Pet() { diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java index 83edfe8f1b23..bb785231f1b1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java index 32444d19acdd..9d5c2c308eb1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java index 2f83d273726a..91e8ee1e802b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java index dd02b0fb77c7..5238da20ffc3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java index a8dec6681788..4ebdbf5df9e9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java index b91c1567b12f..c24f8f747b76 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java index 551677e00563..ae35957b91bc 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java index 90a19fb24947..d3d282c874ef 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index 8c1f9e9b194f..e5ab9b21e43f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java index 545593defd13..8be6238a9d07 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index f999fb3e2642..8641ef120e5f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Addressable.java index f9a6b1067ec3..d0e7bfb86476 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Addressable.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Addressable.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Addressable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; public Addressable href(@Nullable String href) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Animal.java index b29dbe8efd39..0c8cb8083577 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Animal.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.model.Cat; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java index 08bac549b14b..bc64edb04eec 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,10 +31,13 @@ public class Bar extends Entity implements BarRefOrValue { private String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String barPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooRefOrValue foo; public Bar() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java index 56ec87c814f9..3f5b4256e723 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,10 +31,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class BarCreate extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String barPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooRefOrValue foo; public BarCreate() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java index 40ee2c3a45b0..2d90776388b2 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRefOrValue.java index ab87b4e19343..e1385ddbe2b5 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRefOrValue.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRefOrValue.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Cat.java index a20b560e1db5..58304d1342ea 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Cat.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat implements Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat declawed(@Nullable Boolean declawed) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Dog.java index 21027bd2a0c7..839d1f59dd89 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Dog.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog implements Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean bark; public Dog bark(@Nullable Boolean bark) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Entity.java index 85b5400d724f..11223227fa0d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Entity.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -39,12 +40,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/EntityRef.java index 954d2ea25db7..cbccde89ef95 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/EntityRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,18 +36,24 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class EntityRef { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atReferredType; public EntityRef() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Extensible.java index 195c36d1cee0..d4c4f14453fa 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Extensible.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Extensible.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Extensible { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java index 9ca19d89d4e6..431f23f1ef41 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,8 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Foo extends Entity implements FooRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; public Foo() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java index d14307516721..b9cdf2d4af53 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FooRef extends EntityRef implements FooRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foorefPropA; public FooRef() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRefOrValue.java index 92a36be5504c..041ec79c2fea 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRefOrValue.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRefOrValue.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java index 63a023c9865e..9d7c16fb9dca 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pasta extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String vendor; public Pasta() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java index 100062a10da8..3d3af7c1fafd 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pizza extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal pizzaSize; public Pizza() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java index 08aaf3546307..102dcce88e74 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PizzaSpeziale extends Pizza { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String toppings; public PizzaSpeziale() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Addressable.java index 01f658c863e4..9b05e4d16122 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Addressable.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Addressable.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class Addressable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; public Addressable href(@Nullable String href) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Animal.java index d8ed924f20a1..4fd5acddff32 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Animal.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.model.Cat; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java index 239b1135bcbe..9e2ea2f24a62 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,10 +31,13 @@ public final class Bar extends Entity implements BarRefOrValue { private String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String barPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooRefOrValue foo; public Bar() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java index ec9f1590b435..5ee8db41ff6f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,10 +31,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class BarCreate extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String barPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooRefOrValue foo; public BarCreate() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java index 5a9b17986500..0e14989a0739 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRefOrValue.java index be725b23d19b..a455f585de60 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRefOrValue.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRefOrValue.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Cat.java index 4c3570b392b7..9f2e8c8c495a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Cat.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class Cat implements Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat declawed(@Nullable Boolean declawed) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Dog.java index 884a55458355..8edc1b45d3f7 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Dog.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class Dog implements Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean bark; public Dog bark(@Nullable Boolean bark) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Entity.java index cbd4a97b9eb4..9b9c29f704c2 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Entity.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -39,12 +40,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public sealed class Entity permits Bar, BarCreate, Foo, Pasta, Pizza { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/EntityRef.java index 1daeaa2701e3..aa7391d6cccc 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/EntityRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,18 +36,24 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public sealed class EntityRef permits BarRef, FooRef { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atReferredType; public EntityRef() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Extensible.java index d7b62305dceb..24234d98014b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Extensible.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Extensible.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class Extensible { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java index a5b33b8e2a46..8ff01ec55ba8 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,8 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class Foo extends Entity implements FooRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; public Foo() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java index 49bec913bb3f..60d0d5b9a1bf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class FooRef extends EntityRef implements FooRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foorefPropA; public FooRef() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRefOrValue.java index 6a843721830d..0ffd4690c3f9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRefOrValue.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRefOrValue.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java index e2495283295d..eaacf3b21bed 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class Pasta extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String vendor; public Pasta() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java index f643bb023817..5eac52b5fbce 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public sealed class Pizza extends Entity permits PizzaSpeziale { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal pizzaSize; public Pizza() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java index d57f11177bad..a2f66be71bc1 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public final class PizzaSpeziale extends Pizza { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String toppings; public PizzaSpeziale() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java index 4029f531acae..4f52a29c442d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Addressable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; public Addressable href(@Nullable String href) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Animal.java index f41f4d94ee82..e9a9fade8980 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Animal.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.model.Cat; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index c53f3343ea32..30f90a65797e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,10 +31,13 @@ public class Bar extends Entity implements BarRefOrValue { private String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String barPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooRefOrValue foo; public Bar() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index e0153107c87e..55c1dd43842f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,10 +31,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class BarCreate extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String barPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooRefOrValue foo; public BarCreate() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java index 116f54512c76..96551328c5a0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRefOrValue.java index ab87b4e19343..e1385ddbe2b5 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRefOrValue.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRefOrValue.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Cat.java index c6427749daa9..88c77c259c5f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Cat.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat implements Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat declawed(@Nullable Boolean declawed) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Dog.java index a201cd5f7ebe..2d11c2429105 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Dog.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog implements Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean bark; public Dog bark(@Nullable Boolean bark) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java index e54e98e66e9b..9ab51ef5c5a4 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -39,12 +40,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java index add9f4e0b794..e2a5b577c7e2 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,18 +36,24 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class EntityRef { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String href; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atReferredType; public EntityRef() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java index fa85b1558bab..9ec937c77d21 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Extensible { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; private String atType; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index d82888ae6845..2cf4543381ce 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,8 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Foo extends Entity implements FooRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropA; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String fooPropB; public Foo() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index 6c2209d14464..724ad21804d1 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FooRef extends EntityRef implements FooRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foorefPropA; public FooRef() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java index 92a36be5504c..041ec79c2fea 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRefOrValue.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index ffbade76e87b..e69da587088a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pasta extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String vendor; public Pasta() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index 312584d62c98..a197466d7eb2 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pizza extends Entity { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal pizzaSize; public Pizza() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index 428d3a853664..e708f43dd510 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PizzaSpeziale extends Pizza { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String toppings; public PizzaSpeziale() { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Category.java index c7b1dcda55e7..4db565ed910b 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -30,8 +31,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category() { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/ModelApiResponse.java index 6875c2eec2c3..51fd4cd72a3f 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -32,10 +33,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse() { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java index dbec2cf79e82..2024221cddda 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -34,12 +35,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -80,8 +85,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order() { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java index b47d33bd111f..c8aa62434b74 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -37,14 +38,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -84,6 +88,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Tag.java index ba817df22dca..017bcd686bbe 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -30,8 +31,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag() { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/User.java index 3a32140fcfd6..99e49396d9a0 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -30,20 +31,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java index c7b1dcda55e7..4db565ed910b 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -30,8 +31,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java index 6875c2eec2c3..51fd4cd72a3f 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -32,10 +33,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java index 2fa5c720cadf..91b5b4f7814d 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -33,12 +34,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -79,8 +84,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index abae43afa1cb..be278febcda3 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -36,14 +37,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -83,6 +87,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java index ba817df22dca..017bcd686bbe 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -30,8 +31,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag() { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java index 3a32140fcfd6..99e49396d9a0 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -30,20 +31,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User() { diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java index b1f59fc7a653..cc8b5f4e0098 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.time.OffsetDateTime; import java.util.ArrayList; @@ -34,18 +37,23 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Foo { + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dt; + @JsonInclude(JsonInclude.Include.NON_NULL) private org.springframework.core.io.@Nullable Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) private List listOfDt = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List listMinIntems = new ArrayList<>(); @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime requiredDt; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal number; public Foo() { @@ -89,6 +97,7 @@ public Foo dt(OffsetDateTime dt) { return dt; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dt") @JacksonXmlProperty(localName = "dt") public void setDt(@Nullable OffsetDateTime dt) { @@ -113,6 +122,7 @@ public Foo binary(org.springframework.core.io.Resource binary) { return binary; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("binary") @JacksonXmlProperty(localName = "binary") public void setBinary(org.springframework.core.io.@Nullable Resource binary) { @@ -146,6 +156,7 @@ public List getListOfDt() { return listOfDt; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("listOfDt") @JacksonXmlProperty(localName = "listOfDt") @JacksonXmlElementWrapper(useWrapping = false) @@ -180,6 +191,7 @@ public List getListMinIntems() { return listMinIntems; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("listMinIntems") @JacksonXmlProperty(localName = "listMinIntems") @JacksonXmlElementWrapper(useWrapping = false) @@ -229,6 +241,7 @@ public Foo number(BigDecimal number) { return number; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("number") @JacksonXmlProperty(localName = "number") public void setNumber(@Nullable BigDecimal number) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java index 34e7a64eac0a..2e3466bacb4f 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Category.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -29,8 +32,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category() { @@ -63,6 +68,7 @@ public Category id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -87,6 +93,7 @@ public Category name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") @JacksonXmlProperty(localName = "name") public void setName(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java index 6004313de20c..6a57d5090312 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -31,10 +34,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse() { @@ -68,6 +74,7 @@ public ModelApiResponse code(@Nullable Integer code) { return code; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") @JacksonXmlProperty(localName = "code") public void setCode(@Nullable Integer code) { @@ -92,6 +99,7 @@ public ModelApiResponse type(@Nullable String type) { return type; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") @JacksonXmlProperty(localName = "type") public void setType(@Nullable String type) { @@ -116,6 +124,7 @@ public ModelApiResponse message(@Nullable String message) { return message; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("message") @JacksonXmlProperty(localName = "message") public void setMessage(@Nullable String message) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java index f7d7d7881c5b..0dec395e6c23 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; @@ -33,12 +36,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -79,8 +86,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order() { @@ -117,6 +126,7 @@ public Order id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -141,6 +151,7 @@ public Order petId(@Nullable Long petId) { return petId; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") @JacksonXmlProperty(localName = "petId") public void setPetId(@Nullable Long petId) { @@ -165,6 +176,7 @@ public Order quantity(@Nullable Integer quantity) { return quantity; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") @JacksonXmlProperty(localName = "quantity") public void setQuantity(@Nullable Integer quantity) { @@ -189,6 +201,7 @@ public Order shipDate(@Nullable OffsetDateTime shipDate) { return shipDate; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") @JacksonXmlProperty(localName = "shipDate") public void setShipDate(@Nullable OffsetDateTime shipDate) { @@ -213,6 +226,7 @@ public Order status(@Nullable StatusEnum status) { return status; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") @JacksonXmlProperty(localName = "status") public void setStatus(@Nullable StatusEnum status) { @@ -237,6 +251,7 @@ public Boolean getComplete() { return complete; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("complete") @JacksonXmlProperty(localName = "complete") public void setComplete(Boolean complete) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java index 9d85e669eb1d..8324912f99f4 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -36,14 +39,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -83,6 +89,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -128,6 +135,7 @@ public Pet id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -152,6 +160,7 @@ public Pet category(@Nullable Category category) { return category; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") @JacksonXmlProperty(localName = "Category") public void setCategory(@Nullable Category category) { @@ -245,6 +254,7 @@ public Pet addTagsItem(Tag tagsItem) { return tags; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") @JacksonXmlProperty(localName = "Tag") @JacksonXmlElementWrapper(localName = "tag", useWrapping = true) @@ -275,6 +285,7 @@ public Pet status(@Nullable StatusEnum status) { /** * @deprecated */ + @JsonSetter(nulls = Nulls.SKIP) @Deprecated @JsonProperty("status") @JacksonXmlProperty(localName = "status") diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java index b757b5b9f2d1..0bec5173b0c4 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Tag.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -29,8 +32,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag() { @@ -63,6 +68,7 @@ public Tag id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -87,6 +93,7 @@ public Tag name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") @JacksonXmlProperty(localName = "name") public void setName(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java index 1ba38e956546..038d7e6183e3 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/User.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -29,20 +32,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User() { @@ -81,6 +92,7 @@ public User id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -105,6 +117,7 @@ public User username(@Nullable String username) { return username; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") @JacksonXmlProperty(localName = "username") public void setUsername(@Nullable String username) { @@ -129,6 +142,7 @@ public User firstName(@Nullable String firstName) { return firstName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") @JacksonXmlProperty(localName = "firstName") public void setFirstName(@Nullable String firstName) { @@ -153,6 +167,7 @@ public User lastName(@Nullable String lastName) { return lastName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") @JacksonXmlProperty(localName = "lastName") public void setLastName(@Nullable String lastName) { @@ -177,6 +192,7 @@ public User email(@Nullable String email) { return email; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") @JacksonXmlProperty(localName = "email") public void setEmail(@Nullable String email) { @@ -201,6 +217,7 @@ public User password(@Nullable String password) { return password; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") @JacksonXmlProperty(localName = "password") public void setPassword(@Nullable String password) { @@ -225,6 +242,7 @@ public User phone(@Nullable String phone) { return phone; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") @JacksonXmlProperty(localName = "phone") public void setPhone(@Nullable String phone) { @@ -249,6 +267,7 @@ public User userStatus(@Nullable Integer userStatus) { return userStatus; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("userStatus") @JacksonXmlProperty(localName = "userStatus") public void setUserStatus(@Nullable Integer userStatus) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java index 317c9f2096cf..ecc0907d4f84 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java index 73c4e9155bf9..fae3dd4bb065 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java index 921ef32d3860..2cc89e0d59e7 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -24,12 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -70,8 +75,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index a4293e0913b8..727a1456e7d6 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -27,14 +28,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -74,6 +78,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java index 45703a589ccb..7b71563ac673 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java index d31bca63fc13..8141694dde14 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,20 +22,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Animal.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Animal.kt index 02f4480dff16..e050e0c67b3e 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Animal.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Animal.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/AnotherAnimal.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/AnotherAnimal.kt index 79141421f051..4d7e7813783d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/AnotherAnimal.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/AnotherAnimal.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt index 8dbaf1af4835..f4315afc3705 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -30,10 +31,12 @@ data class Bird( @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_BIRD", - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("propertyA") val propertyA: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("sameNameProperty") val sameNameProperty: kotlin.Int? = null ) : Animal, AnotherAnimal { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt index 84beafa032ff..16700f93285b 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -30,10 +31,12 @@ data class Robobird( @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_ROBOBIRD", - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("propertyB") val propertyB: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("sameNameProperty") val sameNameProperty: kotlin.String? = null ) : Animal, AnotherAnimal { diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java index 7fca08851f91..dca66d06a793 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.jackson.nullable.JsonNullable; diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java index d91a86055f47..81201b26e660 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java index 78c2a23f49e8..8d9f08158951 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index 94a8594b760b..0457ea557942 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java index c121c4b8f60d..835acb839d45 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.jackson.nullable.JsonNullable; diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java index e3174c7cce4c..0f26400f5e74 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.jackson.nullable.JsonNullable; diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt index ca3f8ceb65a9..346b27b010fd 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,11 +22,13 @@ import javax.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 7618278dd799..fea80bf07f56 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt index f8819a1b18e2..15928412fa8c 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import javax.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt index 37e0689e58c3..670dc5f17b3b 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,19 +34,23 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt index 0d5a6c4648ca..1f632d87106d 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt index 517f05a5c709..bee865cbd102 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import javax.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt index 07967fff45f0..d2f092547146 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 46a6dc2eae84..69680a903735 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt index 715c0fee45d8..b8097d78c038 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt index f0a7a8bb6017..406061b3774e 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt index 321a45dc7b7f..3a13e6f1f0f5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt index 0d1f073cf0a0..936be5f4d9bd 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt index 07967fff45f0..d2f092547146 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 46a6dc2eae84..69680a903735 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt index 715c0fee45d8..b8097d78c038 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt index f0a7a8bb6017..406061b3774e 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt index 321a45dc7b7f..3a13e6f1f0f5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt index 0d1f073cf0a0..936be5f4d9bd 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt index 07967fff45f0..d2f092547146 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 46a6dc2eae84..69680a903735 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt index 715c0fee45d8..b8097d78c038 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt index f0a7a8bb6017..406061b3774e 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt index 321a45dc7b7f..3a13e6f1f0f5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt index 0d1f073cf0a0..936be5f4d9bd 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt index 07967fff45f0..d2f092547146 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 46a6dc2eae84..69680a903735 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt index 715c0fee45d8..b8097d78c038 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt index f0a7a8bb6017..406061b3774e 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt index 321a45dc7b7f..3a13e6f1f0f5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt index 0d1f073cf0a0..936be5f4d9bd 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt index 07967fff45f0..d2f092547146 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 46a6dc2eae84..69680a903735 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt index 715c0fee45d8..b8097d78c038 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt index f0a7a8bb6017..406061b3774e 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt index 321a45dc7b7f..3a13e6f1f0f5 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt index 0d1f073cf0a0..936be5f4d9bd 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt index dbd94dbc7049..997ffb3e5d89 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,7 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class Annotation( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: java.util.UUID? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt index 2ac072129d73..ed7ecfc57b5e 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -49,46 +50,56 @@ data class AnyOfUserOrPet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: AnyOfUserOrPet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt index fc7a28a02d0d..0edca44a3342 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -49,46 +50,56 @@ data class AnyOfUserOrPetOrArrayString( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: AnyOfUserOrPetOrArrayString.Status? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt index facc07134f56..96abacdb65a6 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f58f23e7598f..62f2149be444 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt index 83f2628de198..c671b3153787 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt index e0f3913e9259..cb758490acdf 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : UserOrPet, UserOrPetOrArrayString { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt index b212ce890669..1a44a78a0d05 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt index 6fdaee387140..661454657695 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -34,31 +35,38 @@ data class User( @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : UserOrPet, UserOrPetOrArrayString { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt index 561cb29a10bb..470958614b6f 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt index 21b795f8afa9..ac6e66aebde0 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt index ea40bb2c965f..581bab297217 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,11 +22,13 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 7103b6cafec1..3bab7deffb0e 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt index 9f5e9a70e069..9dd105064c14 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,22 +30,28 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : PlaceOrderResponse, GetOrderByIdResponse { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt index 44bea7571691..7566e1d6c13b 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -36,19 +37,23 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : UpdatePetResponse, AddPetResponse, GetPetByIdResponse { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt index 8ac0ee0bf487..782d68c93432 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt index c8caeb1b6dc0..f608f06a3f33 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -28,28 +29,36 @@ import jakarta.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : GetUserByNameResponse { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt index a21009655d77..b0e4794faefe 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,11 +22,13 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index b0ca34c2fa9e..f458df012389 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt index 7dcae28c0485..368956fddbf0 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt index fb6a4ba5a866..8741ad4b1938 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,19 +34,23 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt index a5a0baad98c8..2c44360dc67d 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt index 409a68510ec0..c8005bf5c49a 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import jakarta.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt index a21009655d77..b0e4794faefe 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,11 +22,13 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index b0ca34c2fa9e..f458df012389 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt index 7dcae28c0485..368956fddbf0 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt index fb6a4ba5a866..8741ad4b1938 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,19 +34,23 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt index a5a0baad98c8..2c44360dc67d 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt index 409a68510ec0..c8005bf5c49a 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import jakarta.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt index a21009655d77..b0e4794faefe 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,11 +22,13 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index b0ca34c2fa9e..f458df012389 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt index 7dcae28c0485..368956fddbf0 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt index fb6a4ba5a866..8741ad4b1938 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,19 +34,23 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt index a5a0baad98c8..2c44360dc67d 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt index 409a68510ec0..c8005bf5c49a 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import jakarta.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt index a21009655d77..b0e4794faefe 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,11 +22,13 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index b0ca34c2fa9e..f458df012389 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt index 7dcae28c0485..368956fddbf0 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt index 03ea024df173..58d7255cb3fd 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,19 +34,23 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : kotlin.collections.HashMap(), java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt index a5a0baad98c8..2c44360dc67d 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt index 409a68510ec0..c8005bf5c49a 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import jakarta.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt index bbe9a05bda0e..916ce85eebba 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -33,11 +34,13 @@ data class Apa( @get:JsonProperty("cepa", required = true) val cepa: java.math.BigDecimal = java.math.BigDecimal("6.28318"), @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("depa") val depa: java.math.BigDecimal? = java.math.BigDecimal("71"), @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("epa") val epa: java.math.BigDecimal? = java.math.BigDecimal("-71"), @Schema(example = "null", description = "") diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt index 0a593d726463..e5d5accbdc65 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index abe7e2e0af5c..e77f7fcfcaa9 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt index 3efc155f0902..1fc046509656 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt index b7d6097268cc..7f87b7fdfdda 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt index 8d528d428882..2ff6a60d3146 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt index bee8b756bc1b..e67a4707fb9f 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt index facc07134f56..96abacdb65a6 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f58f23e7598f..62f2149be444 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt index 83f2628de198..c671b3153787 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index ec30cdcdbc5f..85efde780ca0 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index b212ce890669..1a44a78a0d05 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt index 0e055e0afe02..f569ada23504 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt index 9c4d77f6a75e..4423010ee3c7 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -45,30 +46,36 @@ data class Cat( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("color") override val color: Color? = null ) : Pet, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt index c5e4ce253a87..9673992ec003 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt index 302fa2eff7d4..506bf064f2c7 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -55,22 +56,26 @@ data class Dog( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("color") override val color: Color? = null ) : Pet, com.some.pack.Fetchable, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 22a9a7ea7618..f671d81fb457 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt index 1dc7672da598..cbfa1ea3b39d 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index bad6273edeec..d9cc53bc246a 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -3,6 +3,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index 636157b0d44f..fd576418a022 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt index 7247f2eb5aa3..720055637910 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt index a48b4b5e4b8e..59ded438d05d 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -28,7 +29,8 @@ data class ApiError( @get:JsonProperty("errorCode", required = true) val errorCode: ApiError.ErrorCode, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("reasonCode") val reasonCode: ReasonCode? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt index a72f52efe412..485aafb2a611 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") var name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index e1f321bd27ea..24839f149be9 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") var code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") var type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") var message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt index 00a939158c1e..1af86070059d 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") var petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") var quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") var shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") var status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") var complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt index 101a0d5bdb27..7cdd47f604c4 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,21 +38,25 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) var photoUrls: kotlin.collections.MutableList, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") var id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") var category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") var tags: kotlin.collections.MutableList? = null, @Schema(example = "null", description = "pet status in the store") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") var status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt index 51be056ab949..0db0c5748a8d 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") var name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt index 387e42af9c98..6f2b9c62684b 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") var username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") var firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") var lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") var email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") var password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") var phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") var userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt index aa14da7376a3..c97a9913a6bb 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,7 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class MultipartMixedRequestMarker( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt index 9bfdc156868c..f6540be77442 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 7618278dd799..fea80bf07f56 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt index f8819a1b18e2..15928412fa8c 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import javax.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index ec6985af729e..563c7704ab70 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,18 +34,22 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index 0d5a6c4648ca..1f632d87106d 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt index 517f05a5c709..bee865cbd102 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import javax.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt index 9bfdc156868c..f6540be77442 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 7618278dd799..fea80bf07f56 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt index f8819a1b18e2..15928412fa8c 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -27,22 +28,28 @@ import javax.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt index ec6985af729e..563c7704ab70 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -33,18 +34,22 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt index 0d5a6c4648ca..1f632d87106d 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt index 517f05a5c709..bee865cbd102 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import javax.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt index 64e80ed513ab..187554e1c993 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("amount") val amount: kotlin.Double? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt index 0b1a09f06d4b..58a5118ac2c5 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,10 +25,12 @@ data class Pet( @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt index 585eb9083623..c3c130a92cc2 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,14 +24,17 @@ import jakarta.validation.Valid */ data class SearchResult( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("query") val query: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("totalHits") val totalHits: kotlin.Int? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("page") val page: PageMeta? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt index 48dd074b73c4..7fa774f6afd4 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import jakarta.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt index 870f3ccc62cc..0c5f1b853735 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,10 +24,12 @@ import jakarta.validation.Valid data class UserList( @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("content") val content: kotlin.collections.List? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("description") val description: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt index facc07134f56..96abacdb65a6 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f58f23e7598f..62f2149be444 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt index 83f2628de198..c671b3153787 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt index ec30cdcdbc5f..85efde780ca0 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt index b212ce890669..1a44a78a0d05 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt index 0e055e0afe02..f569ada23504 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt index facc07134f56..96abacdb65a6 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,12 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f58f23e7598f..62f2149be444 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt index 83f2628de198..c671b3153787 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt index ec30cdcdbc5f..85efde780ca0 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,22 +38,26 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt index b212ce890669..1a44a78a0d05 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt index 0e055e0afe02..f569ada23504 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt index 00138b93b051..d7e534bbf20e 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt index 5854bb80a826..c73012357ad6 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -28,11 +29,13 @@ data class Cat( @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("declawed") val declawed: kotlin.Boolean? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("color") override val color: kotlin.String? = "red" ) : Animal { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt index ba33804e09a1..18612e61c383 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -26,7 +27,8 @@ data class Category( @get:JsonProperty("name", required = true) val name: kotlin.String = "default-name", @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt index 76cbe1780459..76b8a5328f2b 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,7 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class Client( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("client") val client: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt index 1399efc90acb..76f3a24ede74 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -28,11 +29,13 @@ data class Dog( @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("breed") val breed: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("color") override val color: kotlin.String? = "red" ) : Animal { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt index 2f48b3ba7270..a47d21cec152 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,7 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class Foo( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("bar") val bar: kotlin.String? = "bar" ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt index 79280b896909..d05c267032c4 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,7 +25,8 @@ data class FooGetDefaultResponse( @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("string") val string: Foo? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 6e611bfde3f9..8b5817dd4b9d 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt index 7107f5dde4aa..134694c92f86 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt index 94deeafe5d75..09f827782898 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,21 +38,25 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.Set, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt index 5432f8a1fe94..280be218dd27 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt index 10ceb48e183c..e758f48a83c7 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt index f086232ac853..57ac0506d4ed 100644 --- a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt +++ b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -28,6 +29,7 @@ data class NullableModel( @get:JsonProperty("requiredNullable", required = true) val requiredNullable: kotlin.String?, + @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.FAIL) @get:JsonProperty("optionalNonNullable") val optionalNonNullable: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt index 27c2649c2f6f..a336e2045aac 100644 --- a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,9 +25,11 @@ data class Pet( @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.FAIL) @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.FAIL) @get:JsonProperty("status") val status: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt index ac6f42acee61..ca11e50c2e4c 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 9c1f941f8b9b..7dc537866aea 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt index cd6d207bf7d5..e63b9f3abfd9 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(example = "null", value = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt index 59c619dfe330..07e7c720dfa1 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,21 +38,25 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @ApiModelProperty(example = "null", value = "pet status in the store") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt index efe28fdb364c..7ddd6b818efd 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt index 1badf4313715..758e2f942f87 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(example = "null", value = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt index 8e2b19cdf379..f4506b6a42c7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 97df19122cab..210a5a50b80c 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt index 25a14fcf8421..0a5ed61d66bb 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt index 2ce619534245..55a124f7e163 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -37,21 +38,25 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt index 5297914c6f01..f061d0ae5dc8 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt index 25a3d62812c8..84f1c5e8846d 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt index 9c4d77f6a75e..4423010ee3c7 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -45,30 +46,36 @@ data class Cat( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("color") override val color: Color? = null ) : Pet, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt index 33d859b4e8a7..edc6bb547afb 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") override val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") override val name: kotlin.String? = null ) : com.some.pack.CategoryInterface, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt index 3227118e8756..d1cea67efe9b 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -55,22 +56,26 @@ data class Dog( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("color") override val color: Color? = null ) : Pet, com.some.pack.Canine, com.some.pack.Fetchable, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 22a9a7ea7618..f671d81fb457 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -24,15 +25,18 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt index 1dc7672da598..cbfa1ea3b39d 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -29,27 +30,33 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt index df7bfc8367c9..325017618776 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt @@ -3,6 +3,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonSubTypes diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt index 636157b0d44f..fd576418a022 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -23,11 +24,13 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt index 7247f2eb5aa3..720055637910 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -29,35 +30,43 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt index 9bfdc156868c..f6540be77442 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Category( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 7618278dd799..fea80bf07f56 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -22,13 +23,16 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt index 0aefed01433e..c2d2ffd380bd 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -28,22 +29,28 @@ import javax.validation.Valid */ data class Order( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt index 076207ab8f19..af9db4dc4631 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,6 +2,7 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue @@ -34,18 +35,22 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt index 0d5a6c4648ca..1f632d87106d 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -21,10 +22,12 @@ import javax.validation.Valid */ data class Tag( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt index 517f05a5c709..bee865cbd102 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt @@ -1,6 +1,7 @@ package org.openapitools.model import java.util.Objects +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls @@ -27,28 +28,36 @@ import javax.validation.Valid */ data class User( - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonSetter(nulls = Nulls.FAIL) + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index 477d63f9d403..c9f31894c58e 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -34,15 +35,19 @@ public class ObjectWithUniqueItems { private JsonNullable> nullSet = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Set notNullSet = new LinkedHashSet<>(); private JsonNullable> nullList = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List notNullList = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime notNullDateField; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime nullDateField; diff --git a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Dog.java index 24ffa082c4d3..6fa27584d5eb 100644 --- a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Dog.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer age; public Dog name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Error.java b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Error.java index c656d421a5d6..548cf18f1318 100644 --- a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Error.java +++ b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/model/Error.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Error { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public Error code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 6a1fd4208cea..e2afd3c0eb92 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -25,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { @@ -43,6 +47,7 @@ public AdditionalPropertiesAnyType name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index aacf1b5786a0..9e90833a4256 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.util.List; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -26,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesArray name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 6ba727c2ed30..b30d9c67b23d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -25,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { @@ -43,6 +47,7 @@ public AdditionalPropertiesBoolean name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 994a78cab901..5c368985609f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; @@ -25,26 +28,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private @Nullable Object anytype2 = null; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { @@ -71,6 +84,7 @@ public Map getMapString() { return mapString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_string") public void setMapString(Map mapString) { this.mapString = mapString; @@ -100,6 +114,7 @@ public Map getMapNumber() { return mapNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_number") public void setMapNumber(Map mapNumber) { this.mapNumber = mapNumber; @@ -129,6 +144,7 @@ public Map getMapInteger() { return mapInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_integer") public void setMapInteger(Map mapInteger) { this.mapInteger = mapInteger; @@ -158,6 +174,7 @@ public Map getMapBoolean() { return mapBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_boolean") public void setMapBoolean(Map mapBoolean) { this.mapBoolean = mapBoolean; @@ -187,6 +204,7 @@ public Map> getMapArrayInteger() { return mapArrayInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_integer") public void setMapArrayInteger(Map> mapArrayInteger) { this.mapArrayInteger = mapArrayInteger; @@ -216,6 +234,7 @@ public Map> getMapArrayAnytype() { return mapArrayAnytype; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_anytype") public void setMapArrayAnytype(Map> mapArrayAnytype) { this.mapArrayAnytype = mapArrayAnytype; @@ -245,6 +264,7 @@ public Map> getMapMapString() { return mapMapString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_string") public void setMapMapString(Map> mapMapString) { this.mapMapString = mapMapString; @@ -274,6 +294,7 @@ public Map> getMapMapAnytype() { return mapMapAnytype; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_anytype") public void setMapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; @@ -295,6 +316,7 @@ public AdditionalPropertiesClass anytype1(@Nullable Object anytype1) { return anytype1; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("anytype_1") public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; @@ -337,6 +359,7 @@ public AdditionalPropertiesClass anytype3(@Nullable Object anytype3) { return anytype3; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("anytype_3") public void setAnytype3(@Nullable Object anytype3) { this.anytype3 = anytype3; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 823990be1e16..5c941f7c1ab4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -25,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { @@ -43,6 +47,7 @@ public AdditionalPropertiesInteger name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 9a6a8f45705f..b37b2603009b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -26,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesNumber name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index ea0cceb9849a..b0dc27f6a837 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.util.Map; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -26,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { @@ -44,6 +48,7 @@ public AdditionalPropertiesObject name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 7c73a5ae2860..0bda9f748eb4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -25,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { @@ -43,6 +47,7 @@ public AdditionalPropertiesString name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java index a9b0786b7b8b..e019aa153c1b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java @@ -3,10 +3,13 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -37,6 +40,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { @@ -87,6 +91,7 @@ public String getColor() { return color; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("color") public void setColor(String color) { this.color = color; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 1d853669eaf0..75c8aa939fa3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -25,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { @@ -51,6 +55,7 @@ public List> getArrayArrayNumber() { return arrayArrayNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("ArrayArrayNumber") public void setArrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 459999a41443..6d5419846833 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -25,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @@ -51,6 +55,7 @@ public List getArrayNumber() { return arrayNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("ArrayNumber") public void setArrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index 244a344e176d..17629c019186 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -25,10 +28,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { @@ -55,6 +61,7 @@ public List getArrayOfString() { return arrayOfString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_of_string") public void setArrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; @@ -84,6 +91,7 @@ public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_array_of_integer") public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { this.arrayArrayOfInteger = arrayArrayOfInteger; @@ -113,6 +121,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO return arrayArrayOfModel; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_array_of_model") public void setArrayArrayOfModel(List> arrayArrayOfModel) { this.arrayArrayOfModel = arrayArrayOfModel; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 91601e09f91f..6b642c32d30e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -3,11 +3,14 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.Cat; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -66,6 +69,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { @@ -95,6 +99,7 @@ public BigCat kind(@Nullable KindEnum kind) { return kind; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("kind") public void setKind(@Nullable KindEnum kind) { this.kind = kind; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java index 1551741bfbff..b8064c1bdcb7 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,16 +24,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { @@ -49,6 +58,7 @@ public Capitalization smallCamel(@Nullable String smallCamel) { return smallCamel; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("smallCamel") public void setSmallCamel(@Nullable String smallCamel) { this.smallCamel = smallCamel; @@ -70,6 +80,7 @@ public Capitalization capitalCamel(@Nullable String capitalCamel) { return capitalCamel; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("CapitalCamel") public void setCapitalCamel(@Nullable String capitalCamel) { this.capitalCamel = capitalCamel; @@ -91,6 +102,7 @@ public Capitalization smallSnake(@Nullable String smallSnake) { return smallSnake; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("small_Snake") public void setSmallSnake(@Nullable String smallSnake) { this.smallSnake = smallSnake; @@ -112,6 +124,7 @@ public Capitalization capitalSnake(@Nullable String capitalSnake) { return capitalSnake; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("Capital_Snake") public void setCapitalSnake(@Nullable String capitalSnake) { this.capitalSnake = capitalSnake; @@ -133,6 +146,7 @@ public Capitalization scAETHFlowPoints(@Nullable String scAETHFlowPoints) { return scAETHFlowPoints; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("SCA_ETH_Flow_Points") public void setScAETHFlowPoints(@Nullable String scAETHFlowPoints) { this.scAETHFlowPoints = scAETHFlowPoints; @@ -154,6 +168,7 @@ public Capitalization ATT_NAME(@Nullable String ATT_NAME) { return ATT_NAME; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("ATT_NAME") public void setATTNAME(@Nullable String ATT_NAME) { this.ATT_NAME = ATT_NAME; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java index 821b00816d66..38d0b7a5ac45 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java @@ -3,10 +3,13 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.Animal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -34,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { @@ -63,6 +67,7 @@ public Cat declawed(@Nullable Boolean declawed) { return declawed; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("declawed") public void setDeclawed(@Nullable Boolean declawed) { this.declawed = declawed; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java index 6272127060d1..8c8e381fe2c2 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; @@ -52,6 +56,7 @@ public Category id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java index 4aad1179af01..8a68ed6002ed 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,11 +3,14 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.ParentWithNullable; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -27,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { @@ -45,6 +49,7 @@ public ChildWithNullable otherProperty(@Nullable String otherProperty) { return otherProperty; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("otherProperty") public void setOtherProperty(@Nullable String otherProperty) { this.otherProperty = otherProperty; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java index a8ac3af5353a..f15b39201852 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -22,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { @@ -40,6 +44,7 @@ public ClassModel propertyClass(@Nullable String propertyClass) { return propertyClass; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("_class") public void setPropertyClass(@Nullable String propertyClass) { this.propertyClass = propertyClass; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java index a5d73f7f8a2f..123113a8e929 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { @@ -39,6 +43,7 @@ public Client client(@Nullable String client) { return client; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("client") public void setClient(@Nullable String client) { this.client = client; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java index 9fdca0cce4c4..851d9fb4310d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java @@ -3,10 +3,13 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.Animal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -26,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { @@ -55,6 +59,7 @@ public Dog breed(@Nullable String breed) { return breed; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("breed") public void setBreed(@Nullable String breed) { this.breed = breed; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java index 73061a1be6e4..aaad2ba8e08b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -60,6 +63,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -97,6 +101,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { @@ -115,6 +120,7 @@ public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { return justSymbol; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("just_symbol") public void setJustSymbol(@Nullable JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; @@ -144,6 +150,7 @@ public List getArrayEnum() { return arrayEnum; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_enum") public void setArrayEnum(List arrayEnum) { this.arrayEnum = arrayEnum; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java index 8f72eaee8430..ce15599cb0df 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java @@ -2,10 +2,13 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.openapitools.model.OuterEnum; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -62,6 +65,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -138,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,8 +180,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { @@ -206,6 +213,7 @@ public EnumTest enumString(@Nullable EnumStringEnum enumString) { return enumString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_string") public void setEnumString(@Nullable EnumStringEnum enumString) { this.enumString = enumString; @@ -248,6 +256,7 @@ public EnumTest enumInteger(@Nullable EnumIntegerEnum enumInteger) { return enumInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_integer") public void setEnumInteger(@Nullable EnumIntegerEnum enumInteger) { this.enumInteger = enumInteger; @@ -269,6 +278,7 @@ public EnumTest enumNumber(@Nullable EnumNumberEnum enumNumber) { return enumNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_number") public void setEnumNumber(@Nullable EnumNumberEnum enumNumber) { this.enumNumber = enumNumber; @@ -290,6 +300,7 @@ public EnumTest outerEnum(@Nullable OuterEnum outerEnum) { return outerEnum; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("outerEnum") public void setOuterEnum(@Nullable OuterEnum outerEnum) { this.outerEnum = outerEnum; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java index 8ca6914eed82..104b6f00a77a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -22,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { @@ -40,6 +44,7 @@ public File sourceURI(@Nullable String sourceURI) { return sourceURI; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("sourceURI") public void setSourceURI(@Nullable String sourceURI) { this.sourceURI = sourceURI; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index c8f73f637a57..4dbefee14378 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -25,8 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { @@ -45,6 +50,7 @@ public FileSchemaTestClass file(@Nullable File file) { return file; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("file") public void setFile(@Nullable File file) { this.file = file; @@ -74,6 +80,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { return files; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("files") public void setFiles(List<@Valid File> files) { this.files = files; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java index 93fd30e09dbb..1e4a18325535 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.time.LocalDate; import java.time.OffsetDateTime; @@ -29,34 +32,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { @@ -91,6 +104,7 @@ public FormatTest integer(@Nullable Integer integer) { return integer; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("integer") public void setInteger(@Nullable Integer integer) { this.integer = integer; @@ -114,6 +128,7 @@ public FormatTest int32(@Nullable Integer int32) { return int32; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int32") public void setInt32(@Nullable Integer int32) { this.int32 = int32; @@ -135,6 +150,7 @@ public FormatTest int64(@Nullable Long int64) { return int64; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int64") public void setInt64(@Nullable Long int64) { this.int64 = int64; @@ -181,6 +197,7 @@ public FormatTest _float(@Nullable Float _float) { return _float; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("float") public void setFloat(@Nullable Float _float) { this._float = _float; @@ -204,6 +221,7 @@ public FormatTest _double(@Nullable Double _double) { return _double; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("double") public void setDouble(@Nullable Double _double) { this._double = _double; @@ -225,6 +243,7 @@ public FormatTest string(@Nullable String string) { return string; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("string") public void setString(@Nullable String string) { this.string = string; @@ -267,6 +286,7 @@ public FormatTest binary(@Nullable org.springframework.core.io.Resource binary) return binary; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("binary") public void setBinary(@Nullable org.springframework.core.io.Resource binary) { this.binary = binary; @@ -309,6 +329,7 @@ public FormatTest dateTime(@Nullable OffsetDateTime dateTime) { return dateTime; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -330,6 +351,7 @@ public FormatTest uuid(@Nullable UUID uuid) { return uuid; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -372,6 +394,7 @@ public FormatTest bigDecimal(@Nullable BigDecimal bigDecimal) { return bigDecimal; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("BigDecimal") public void setBigDecimal(@Nullable BigDecimal bigDecimal) { this.bigDecimal = bigDecimal; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index bda2c5a6554b..4ac6241f5c2f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { @@ -43,6 +48,7 @@ public HasOnlyReadOnly bar(@Nullable String bar) { return bar; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -64,6 +70,7 @@ public HasOnlyReadOnly foo(@Nullable String foo) { return foo; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("foo") public void setFoo(@Nullable String foo) { this.foo = foo; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index 527370cad531..edfb29a86fe6 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.util.HashMap; import java.util.Map; import org.springframework.lang.Nullable; @@ -24,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -61,10 +65,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { @@ -91,6 +98,7 @@ public Map> getMapMapOfString() { return mapMapOfString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_of_string") public void setMapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; @@ -120,6 +128,7 @@ public Map getMapOfEnumString() { return mapOfEnumString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_of_enum_string") public void setMapOfEnumString(Map mapOfEnumString) { this.mapOfEnumString = mapOfEnumString; @@ -149,6 +158,7 @@ public Map getDirectMap() { return directMap; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("direct_map") public void setDirectMap(Map directMap) { this.directMap = directMap; @@ -178,6 +188,7 @@ public Map getIndirectMap() { return indirectMap; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("indirect_map") public void setIndirectMap(Map indirectMap) { this.indirectMap = indirectMap; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9d0c87df6fa6..52de4de73917 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.time.OffsetDateTime; import java.util.HashMap; import java.util.Map; @@ -27,11 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { @@ -50,6 +56,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { return uuid; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -71,6 +78,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(@Nullable OffsetDate return dateTime; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -100,6 +108,7 @@ public Map getMap() { return map; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map") public void setMap(Map map) { this.map = map; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java index 7745290df50e..2d39f593c7a0 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -24,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { @@ -44,6 +49,7 @@ public Model200Response name(@Nullable Integer name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable Integer name) { this.name = name; @@ -65,6 +71,7 @@ public Model200Response propertyClass(@Nullable String propertyClass) { return propertyClass; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("class") public void setPropertyClass(@Nullable String propertyClass) { this.propertyClass = propertyClass; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java index c2d469f32999..2a3cbabd5ab1 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { @@ -45,6 +51,7 @@ public ModelApiResponse code(@Nullable Integer code) { return code; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") public void setCode(@Nullable Integer code) { this.code = code; @@ -66,6 +73,7 @@ public ModelApiResponse type(@Nullable String type) { return type; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(@Nullable String type) { this.type = type; @@ -87,6 +95,7 @@ public ModelApiResponse message(@Nullable String message) { return message; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("message") public void setMessage(@Nullable String message) { this.message = message; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java index 36e167f74c92..2fe8cb4f414f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { @@ -41,6 +45,7 @@ public ModelList _123list(@Nullable String _123list) { return _123list; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("123-list") public void set123list(@Nullable String _123list) { this._123list = _123list; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java index 6549831a396e..f5a9f928ec28 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -24,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { @@ -42,6 +46,7 @@ public ModelReturn _return(@Nullable Integer _return) { return _return; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("return") public void setReturn(@Nullable Integer _return) { this._return = _return; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java index 12b8e349273f..9fe37ef88805 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -24,10 +27,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { @@ -78,6 +84,7 @@ public Name snakeCase(@Nullable Integer snakeCase) { return snakeCase; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("snake_case") public void setSnakeCase(@Nullable Integer snakeCase) { this.snakeCase = snakeCase; @@ -99,6 +106,7 @@ public Name property(@Nullable String property) { return property; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("property") public void setProperty(@Nullable String property) { this.property = property; @@ -120,6 +128,7 @@ public Name _123number(@Nullable Integer _123number) { return _123number; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("123Number") public void set123number(@Nullable Integer _123number) { this._123number = _123number; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java index 4cddcad3e7b9..d3ed26743127 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -22,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { @@ -40,6 +44,7 @@ public NumberOnly justNumber(@Nullable BigDecimal justNumber) { return justNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("JustNumber") public void setJustNumber(@Nullable BigDecimal justNumber) { this.justNumber = justNumber; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java index 1c78d39d0a0b..d5b005316e9e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; @@ -24,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -70,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { @@ -90,6 +99,7 @@ public Order id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -111,6 +121,7 @@ public Order petId(@Nullable Long petId) { return petId; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") public void setPetId(@Nullable Long petId) { this.petId = petId; @@ -132,6 +143,7 @@ public Order quantity(@Nullable Integer quantity) { return quantity; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") public void setQuantity(@Nullable Integer quantity) { this.quantity = quantity; @@ -153,6 +165,7 @@ public Order shipDate(@Nullable OffsetDateTime shipDate) { return shipDate; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") public void setShipDate(@Nullable OffsetDateTime shipDate) { this.shipDate = shipDate; @@ -174,6 +187,7 @@ public Order status(@Nullable StatusEnum status) { return status; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { this.status = status; @@ -195,6 +209,7 @@ public Boolean getComplete() { return complete; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("complete") public void setComplete(Boolean complete) { this.complete = complete; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java index e061d957f64f..aadeb51f2df3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; @@ -22,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { @@ -44,6 +50,7 @@ public OuterComposite myNumber(@Nullable BigDecimal myNumber) { return myNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_number") public void setMyNumber(@Nullable BigDecimal myNumber) { this.myNumber = myNumber; @@ -65,6 +72,7 @@ public OuterComposite myString(@Nullable String myString) { return myString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_string") public void setMyString(@Nullable String myString) { this.myString = myString; @@ -86,6 +94,7 @@ public OuterComposite myBoolean(@Nullable Boolean myBoolean) { return myBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_boolean") public void setMyBoolean(@Nullable Boolean myBoolean) { this.myBoolean = myBoolean; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java index 4c788bc18481..c3baa15b9020 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,11 +3,14 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -67,6 +70,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private @Nullable String nullableProperty = null; @@ -87,6 +91,7 @@ public ParentWithNullable type(@Nullable TypeEnum type) { return type; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(@Nullable TypeEnum type) { this.type = type; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index e6b581484f5b..0d7b50677b84 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.ArrayList; import java.util.Arrays; @@ -30,14 +33,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -77,6 +83,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -108,6 +115,7 @@ public Pet id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -129,6 +137,7 @@ public Pet category(@Nullable Category category) { return category; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(@Nullable Category category) { this.category = category; @@ -209,6 +218,7 @@ public Pet addTagsItem(Tag tagsItem) { return tags; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List<@Valid Tag> tags) { this.tags = tags; @@ -235,6 +245,7 @@ public Pet status(@Nullable StatusEnum status) { /** * @deprecated */ + @JsonSetter(nulls = Nulls.SKIP) @Deprecated @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index d5e12959bd88..a1bdd96a988c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { @@ -41,6 +46,7 @@ public ReadOnlyFirst bar(@Nullable String bar) { return bar; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -62,6 +68,7 @@ public ReadOnlyFirst baz(@Nullable String baz) { return baz; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("baz") public void setBaz(@Nullable String baz) { this.baz = baz; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 3c3cea556e6d..f7478615ae5c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { @@ -45,6 +52,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String return normalPropertyName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("normalPropertyName") public void setNormalPropertyName(@Nullable String normalPropertyName) { this.normalPropertyName = normalPropertyName; @@ -66,6 +74,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(@Nullable return UPPER_CASE_PROPERTY_SNAKE; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("UPPER_CASE_PROPERTY_SNAKE") public void setUPPERCASEPROPERTYSNAKE(@Nullable String UPPER_CASE_PROPERTY_SNAKE) { this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; @@ -87,6 +96,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(@Nullable S return lowerCasePropertyDashes; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lower-case-property-dashes") public void setLowerCasePropertyDashes(@Nullable String lowerCasePropertyDashes) { this.lowerCasePropertyDashes = lowerCasePropertyDashes; @@ -108,6 +118,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(@Nullable St return propertyNameWithSpaces; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("property name with spaces") public void setPropertyNameWithSpaces(@Nullable String propertyNameWithSpaces) { this.propertyNameWithSpaces = propertyNameWithSpaces; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java index 95f662c869b6..4dccb9267334 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,9 +2,12 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -23,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { @@ -41,6 +45,7 @@ public class SpecialModelName { return $specialPropertyName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("$special[property.name]") public void set$SpecialPropertyName(@Nullable Long $specialPropertyName) { this.$specialPropertyName = $specialPropertyName; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java index 46da6e9c69ae..e0d4dccba47b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { @@ -41,6 +46,7 @@ public Tag id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -62,6 +68,7 @@ public Tag name(@Nullable String name) { return name; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable String name) { this.name = name; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java index a263f2d4d4f3..6a38def1acf3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -21,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { @@ -53,6 +64,7 @@ public User id(@Nullable Long id) { return id; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -74,6 +86,7 @@ public User username(@Nullable String username) { return username; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") public void setUsername(@Nullable String username) { this.username = username; @@ -95,6 +108,7 @@ public User firstName(@Nullable String firstName) { return firstName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") public void setFirstName(@Nullable String firstName) { this.firstName = firstName; @@ -116,6 +130,7 @@ public User lastName(@Nullable String lastName) { return lastName; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") public void setLastName(@Nullable String lastName) { this.lastName = lastName; @@ -137,6 +152,7 @@ public User email(@Nullable String email) { return email; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") public void setEmail(@Nullable String email) { this.email = email; @@ -158,6 +174,7 @@ public User password(@Nullable String password) { return password; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") public void setPassword(@Nullable String password) { this.password = password; @@ -179,6 +196,7 @@ public User phone(@Nullable String phone) { return phone; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") public void setPhone(@Nullable String phone) { this.phone = phone; @@ -200,6 +218,7 @@ public User userStatus(@Nullable Integer userStatus) { return userStatus; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("userStatus") public void setUserStatus(@Nullable Integer userStatus) { this.userStatus = userStatus; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java index cc789c0be01c..942a2c1cd7a3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java @@ -2,8 +2,11 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -25,62 +28,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { @@ -99,6 +131,7 @@ public XmlItem attributeString(@Nullable String attributeString) { return attributeString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_string") public void setAttributeString(@Nullable String attributeString) { this.attributeString = attributeString; @@ -120,6 +153,7 @@ public XmlItem attributeNumber(@Nullable BigDecimal attributeNumber) { return attributeNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_number") public void setAttributeNumber(@Nullable BigDecimal attributeNumber) { this.attributeNumber = attributeNumber; @@ -141,6 +175,7 @@ public XmlItem attributeInteger(@Nullable Integer attributeInteger) { return attributeInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_integer") public void setAttributeInteger(@Nullable Integer attributeInteger) { this.attributeInteger = attributeInteger; @@ -162,6 +197,7 @@ public XmlItem attributeBoolean(@Nullable Boolean attributeBoolean) { return attributeBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_boolean") public void setAttributeBoolean(@Nullable Boolean attributeBoolean) { this.attributeBoolean = attributeBoolean; @@ -191,6 +227,7 @@ public List getWrappedArray() { return wrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("wrapped_array") public void setWrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; @@ -212,6 +249,7 @@ public XmlItem nameString(@Nullable String nameString) { return nameString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_string") public void setNameString(@Nullable String nameString) { this.nameString = nameString; @@ -233,6 +271,7 @@ public XmlItem nameNumber(@Nullable BigDecimal nameNumber) { return nameNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_number") public void setNameNumber(@Nullable BigDecimal nameNumber) { this.nameNumber = nameNumber; @@ -254,6 +293,7 @@ public XmlItem nameInteger(@Nullable Integer nameInteger) { return nameInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_integer") public void setNameInteger(@Nullable Integer nameInteger) { this.nameInteger = nameInteger; @@ -275,6 +315,7 @@ public XmlItem nameBoolean(@Nullable Boolean nameBoolean) { return nameBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_boolean") public void setNameBoolean(@Nullable Boolean nameBoolean) { this.nameBoolean = nameBoolean; @@ -304,6 +345,7 @@ public List getNameArray() { return nameArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_array") public void setNameArray(List nameArray) { this.nameArray = nameArray; @@ -333,6 +375,7 @@ public List getNameWrappedArray() { return nameWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_wrapped_array") public void setNameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; @@ -354,6 +397,7 @@ public XmlItem prefixString(@Nullable String prefixString) { return prefixString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_string") public void setPrefixString(@Nullable String prefixString) { this.prefixString = prefixString; @@ -375,6 +419,7 @@ public XmlItem prefixNumber(@Nullable BigDecimal prefixNumber) { return prefixNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_number") public void setPrefixNumber(@Nullable BigDecimal prefixNumber) { this.prefixNumber = prefixNumber; @@ -396,6 +441,7 @@ public XmlItem prefixInteger(@Nullable Integer prefixInteger) { return prefixInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_integer") public void setPrefixInteger(@Nullable Integer prefixInteger) { this.prefixInteger = prefixInteger; @@ -417,6 +463,7 @@ public XmlItem prefixBoolean(@Nullable Boolean prefixBoolean) { return prefixBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_boolean") public void setPrefixBoolean(@Nullable Boolean prefixBoolean) { this.prefixBoolean = prefixBoolean; @@ -446,6 +493,7 @@ public List getPrefixArray() { return prefixArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_array") public void setPrefixArray(List prefixArray) { this.prefixArray = prefixArray; @@ -475,6 +523,7 @@ public List getPrefixWrappedArray() { return prefixWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_wrapped_array") public void setPrefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; @@ -496,6 +545,7 @@ public XmlItem namespaceString(@Nullable String namespaceString) { return namespaceString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_string") public void setNamespaceString(@Nullable String namespaceString) { this.namespaceString = namespaceString; @@ -517,6 +567,7 @@ public XmlItem namespaceNumber(@Nullable BigDecimal namespaceNumber) { return namespaceNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_number") public void setNamespaceNumber(@Nullable BigDecimal namespaceNumber) { this.namespaceNumber = namespaceNumber; @@ -538,6 +589,7 @@ public XmlItem namespaceInteger(@Nullable Integer namespaceInteger) { return namespaceInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_integer") public void setNamespaceInteger(@Nullable Integer namespaceInteger) { this.namespaceInteger = namespaceInteger; @@ -559,6 +611,7 @@ public XmlItem namespaceBoolean(@Nullable Boolean namespaceBoolean) { return namespaceBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_boolean") public void setNamespaceBoolean(@Nullable Boolean namespaceBoolean) { this.namespaceBoolean = namespaceBoolean; @@ -588,6 +641,7 @@ public List getNamespaceArray() { return namespaceArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_array") public void setNamespaceArray(List namespaceArray) { this.namespaceArray = namespaceArray; @@ -617,6 +671,7 @@ public List getNamespaceWrappedArray() { return namespaceWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_wrapped_array") public void setNamespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; @@ -638,6 +693,7 @@ public XmlItem prefixNsString(@Nullable String prefixNsString) { return prefixNsString; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_string") public void setPrefixNsString(@Nullable String prefixNsString) { this.prefixNsString = prefixNsString; @@ -659,6 +715,7 @@ public XmlItem prefixNsNumber(@Nullable BigDecimal prefixNsNumber) { return prefixNsNumber; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_number") public void setPrefixNsNumber(@Nullable BigDecimal prefixNsNumber) { this.prefixNsNumber = prefixNsNumber; @@ -680,6 +737,7 @@ public XmlItem prefixNsInteger(@Nullable Integer prefixNsInteger) { return prefixNsInteger; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_integer") public void setPrefixNsInteger(@Nullable Integer prefixNsInteger) { this.prefixNsInteger = prefixNsInteger; @@ -701,6 +759,7 @@ public XmlItem prefixNsBoolean(@Nullable Boolean prefixNsBoolean) { return prefixNsBoolean; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_boolean") public void setPrefixNsBoolean(@Nullable Boolean prefixNsBoolean) { this.prefixNsBoolean = prefixNsBoolean; @@ -730,6 +789,7 @@ public List getPrefixNsArray() { return prefixNsArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_array") public void setPrefixNsArray(List prefixNsArray) { this.prefixNsArray = prefixNsArray; @@ -759,6 +819,7 @@ public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; } + @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_wrapped_array") public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { this.prefixNsWrappedArray = prefixNsWrappedArray; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 76d8693ddc99..7ccf342622d3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 22c038b6e0b2..e08abb3f497f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index dfc10cf23f31..4449cf8090aa 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 2cd4425d52e4..c6f00fd9a031 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 5fb9da3ba0a6..21bd95a0f995 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index e0ccd1ad0cdf..e277a285fcea 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 418f007f606a..bbf997dd8c00 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 4d28d0f47f39..81940ba1ad37 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java index e22bc21acdaf..7b853038a112 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 146cc7eefd60..660c55eb48a0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 6b229a0a1d5d..90fd0747b5da 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index f3eb6172402d..1173a9fe78c4 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 4da1b6fdf99d..1f62b535abff 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java index 093087fc57a7..154d6d25bc97 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java index eeb5e59cfc2e..c67f5f246dac 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java index f35b75c49788..410ee1cb4eae 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java index 31088ab82638..5bfa15dacb5f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java index 47cee12d4440..ae387b568922 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java index e88697906116..b8f2956ecc0b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java index b1fe8cbc0d2e..b1edc327dec5 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java index 227673dcf856..a465c241a412 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java index 07dde33abaaa..6c8b691fed1e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java index a1a084a6d983..5023805bdd8c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index afa9a7aa3679..3463af4418b5 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index 44d7ee0b05f9..3948de8d1910 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 7bbeff8b32bb..39faa04791b2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index b69c7a14da32..8ddbfa0c2781 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7a4c2974d9dd..a3dda98db649 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java index 439c362c7b7a..af35c0a33a7c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java index 9b590c852f2c..ea92a5c0efab 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java index c7416af78e9e..b6b0fc495038 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java index 74ab5f1b8e7c..6448cc22938d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java index 8f892386193d..32f0b3607fac 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java index 81174b352bb0..b2053f5673df 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java index e949021dfe89..5f81bcd2b351 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java index a4f43f760e72..a84ba826ad32 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java index 9abb6924b2ca..2e8b21868af2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 06aa6b565b5a..fd2bcc9a204e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index a77e8f29d6b2..9509a5af23c6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index a33b1fd29316..b8a264088c05 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java index 50a3ab4fd640..a020d44dbd04 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java index b82133e2e11c..3e3f43f0791e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java index 1d6cd6f4be20..6039f7625450 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java index 603b151ddc39..268c92a81e68 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java index 3f6aaa43dc27..5c3ac6226fb7 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java index 9a4856de0185..2233e41f67d8 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java index 60c91015b037..7b85c67f19fb 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -24,12 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -70,8 +75,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index aede8985584b..83272eb288e5 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -27,14 +28,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -74,6 +78,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java index a5a3926ee318..42921e1add69 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java index 6377f5765e2e..44db01604a8a 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -21,20 +22,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 7492d756874d..2d6355daf3b9 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index b2e2626c80e9..5d0d813a7615 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 508d305add57..e0c8ebbcf55c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index c87fc24587b7..688281aacc7a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 85595fe7e12d..1ecec5ae9e22 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0e4e6b3384b2..89284723499d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 19a17f429f69..47c77407b253 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 5bfbf7c46ffa..7951ff0b95c6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java index 0abb3e60b9ad..35a79b5918f6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 35aaec24702c..70e988c53f46 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index f9da3854c5b2..dc619c09055e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 55f9620d656a..53825b6046d3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 4fd789631b90..c6f7a6fad119 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java index 4727c78cfc03..499367cff86d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java index 76aa18ab50e6..a7e83aeb8b0d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java index 330af05a95da..fc111f210681 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java index ae1878e66852..47d512679b2c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java index ebbaaefbac56..f57b3a052cd4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java index 4ddd0c016209..2e7236714525 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java index 9ca51ca3c633..883ae1a8ce00 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java index 8c500c79f1f5..f98ca59c1d8b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java index 17be5a7b16d0..bf50158ded11 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java index 0d52a2589457..9d560e5c538c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 1a1aa156497f..23e248513361 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index 661105f98f92..3329850ed85c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index bdc3fbd23f9a..d604e58c61ab 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 72eb0be4eb41..b842ef98a273 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index c9c7ed067194..c521a97931d8 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java index 994ca379795f..1c1083e84837 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java index b4a335550bd3..d1fed6cc6518 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java index d472b420c30e..ca1e76cef183 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java index 663fb252615a..3c9cb851fada 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java index 54891e57039b..1367dd22892c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java index 750b5a0ae37b..6fb04007d0c1 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java index a2a776f434c3..58af601b05cb 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java index d7870e4e4d5a..fb5459173998 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java index 075675bf4c60..e1b1e5091cce 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index e35e32d13ab5..8e8e0581397e 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 6e0e2c4dcaa0..7acb8a8dfeb6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 98dd5bae06a7..9e3faccf8635 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java index 866ce5a8070c..07bbb41cf377 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java index a34ff5a832bb..ee30eb0ece50 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java index bc775a8cb124..8c4242fb2cba 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java index 965c2089f189..1423fa424f27 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index ace9374e6ba1..4efef6b70296 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 1e201806dd26..0fd87cd49c2d 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index 74afccc6842b..9a030042bd43 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 63a9c9b791de..162d4d054176 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -31,26 +32,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index f013568ee58c..3a1042d19939 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index 5399dfd885eb..bfde843923f1 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 7bbc01ef94b9..dd6d6e33379b 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index e8c5777b7f13..2116bfcc17a7 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AnimalDto.java index c433ccddba4f..f53179d6b901 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -39,6 +40,7 @@ public class AnimalDto { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ApiResponseDto.java index fcb68e6d7ddb..4f453f595b33 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index d94eefae55d0..5dce20e2d7e1 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 3933a17b0591..6d8f6dad14a3 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java index 426e7ceb452b..88243ee05cdb 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,10 +29,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java index 58bff9b0c0f4..0b5fedefdae4 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -69,6 +70,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CapitalizationDto.java index a49afa0b1df1..715f319e8816 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CatDto.java index c24fb0095667..dcc632af9aa9 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CategoryDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CategoryDto.java index 33c0f626691d..dfafac8e76bb 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 9d2dc6efb55f..de757a77d844 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -32,6 +33,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClassModelDto.java index f2f095548a79..7ea028ddf3ed 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClientDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClientDto.java index 43c968f54333..8d416bfa65ed 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ClientDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/DogDto.java index 7a5e17e1d0a9..c5dfd8b8d412 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/DogDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumArraysDto.java index f3df15bdd3ce..b5a0a0c2641c 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,6 +102,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumTestDto.java index 93966fa15c2c..58918cd784f1 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileDto.java index 1330a3c5005d..5a1f92a4e7f2 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 4c540dba13f8..94fc92c39123 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,8 +29,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FormatTestDto.java index ce76b930bcea..e5f1b43cc14c 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 9c91860d45c6..afbdef40b22e 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ListDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ListDto.java index 41d483534b6c..2d5af90a0763 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ListDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123List; public ListDto _123List(@Nullable String _123List) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java index 3a6f4c542ff6..33f6b3a6e68e 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,10 +66,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 6a28d5dd1c0d..d87338349de9 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,11 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/Model200ResponseDto.java index 16bd4ad4c604..b5802b404ddf 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NameDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NameDto.java index 4819e0f028d6..a30723fc62ed 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,10 +28,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123Number; public NameDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NumberOnlyDto.java index a1b3ab47eb4b..69c7fd876b87 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OrderDto.java index 7ce59385f5e4..4ff315109f90 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OrderDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,12 +28,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -73,8 +78,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OuterCompositeDto.java index 8171e15f3a50..6f9c422855d9 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 294c9b5b0ea4..0aaf5955bc17 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -72,6 +73,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java index 9e0a2887bb0d..cf35564ffccf 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -33,14 +34,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -80,6 +84,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index f66688e5de44..ad454607b049 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index 8b6e4e02b2d3..9be47279a573 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,12 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReturnDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReturnDto.java index 1e52e875229d..6944ea631fd9 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 52aea10dde40..59002621b577 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $SpecialPropertyName; public SpecialModelNameDto $SpecialPropertyName(@Nullable Long $SpecialPropertyName) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TagDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TagDto.java index c60a1d638332..b1a6e4010941 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TagDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/UserDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/UserDto.java index 4306aaa2641f..b9aa23db6e3e 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/UserDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,20 +25,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/XmlItemDto.java index 1945dea6c82f..571c967a99ac 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/XmlItemDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,62 +29,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Category.java index 016f7c890582..882ab4270ed4 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -31,12 +32,14 @@ public class Category { @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("id") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("name") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/ModelApiResponse.java index 6f9b1303539e..ac36762bdf87 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -33,18 +34,21 @@ public class ModelApiResponse { @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("code") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("type") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("message") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java index 0839f34ace53..6047b8971c56 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -34,24 +35,28 @@ public class Order { @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("id") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("petId") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("quantity") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("shipDate") + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -96,6 +101,7 @@ public static StatusEnum fromValue(String value) { @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("status") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; @@ -103,6 +109,7 @@ public static StatusEnum fromValue(String value) { @JsonProperty("complete") @lombok.Builder.Default + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java index b60abb0025f0..edb596e44403 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -37,12 +38,14 @@ public class Pet { @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("id") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("category") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; @NotNull @@ -63,6 +66,7 @@ public class Pet { @JsonProperty("tags") @lombok.Builder.Default + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -106,6 +110,7 @@ public static StatusEnum fromValue(String value) { @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("status") + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Tag.java index 0ab54cf9e113..51097f7fee02 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -31,12 +32,14 @@ public class Tag { @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("id") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("name") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/User.java index 75d1e367100e..9eb3514fa1f8 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -31,48 +32,56 @@ public class User { @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("id") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("username") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("firstName") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("lastName") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("email") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("password") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("phone") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("userStatus") + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; } diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Category.java index 900a31aea4f1..990c271a1ecf 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -28,8 +29,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/ModelApiResponse.java index 4deb84d7defa..b1663026be6d 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,10 +31,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Order.java index bd7b4a9f0c5d..691984e19851 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,12 +32,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -77,8 +82,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java index 0a6ccb0fd684..59546552dece 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -34,14 +35,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -81,6 +85,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Tag.java index e8f862b08080..06ab31b5c475 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -28,8 +29,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/User.java index 7f2f94b823ef..e9934c500c38 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -28,20 +29,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Order.java index b105d25c7c01..9adad49469c8 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,8 +25,10 @@ public class Order implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double amount; public Order id(@Nullable String id) { diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Pet.java index b59234021ee7..d13b484c69e7 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,10 +25,12 @@ public class Pet implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String status; public Pet() { diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/SearchResult.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/SearchResult.java index 6f401ed1db08..a051a872cc9f 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/SearchResult.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/SearchResult.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.openapitools.model.PageMeta; @@ -25,10 +26,13 @@ public class SearchResult implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String query; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer totalHits; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable PageMeta page; public SearchResult query(@Nullable String query) { diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/User.java index 415b9bc429a6..812205ccb1de 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,8 +25,10 @@ public class User implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public User id(@Nullable String id) { diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java index de0eac80a6cb..63452e8cc177 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -28,8 +29,10 @@ public class UserList implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid User> content = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String description; public UserList content(List<@Valid User> content) { diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Category.java index c88b862e0390..e8d0a99c0041 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/ModelApiResponse.java index 3ff68d0035f0..0447694c1e52 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Order.java index 2f482c4fce82..c5e11b331d56 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -26,12 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +77,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java index a8191ed172d0..68c9efb880e8 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -29,14 +30,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +80,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Tag.java index 696cc889bb53..ecbd97079cd2 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/User.java index 944b27b7402e..c56d48f280d5 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,20 +24,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 174a196c117c..6be3f816db44 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java index d1c2acababb2..e0e734eb97bb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index f2a7d9d4915a..6ebfafec5c0b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java index 425a9436563d..906b66eb4c49 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java index a81b2cc7b8b9..52700eb1b349 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java index 9a1b61fc9aa3..5862af05641a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java index 07c21315c1c2..ae2690885ecd 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index b99cbe38d15c..598784d46b71 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 83bea1a03bf5..e0de2fb28b2a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java index 8bc87ab7bb80..3e47497b1596 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/NullableModel.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/NullableModel.java index 2b38753048fa..da9cc1031bb8 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/NullableModel.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/NullableModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Arrays; @@ -31,6 +32,7 @@ public class NullableModel implements Serializable { private JsonNullable requiredNullable = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String optionalNonNullable; private JsonNullable optionalNullable = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/Pet.java index fd20e3326964..112ed1a4ed1f 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -24,10 +25,12 @@ public class Pet implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String status; public Pet() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 712d4eddf40e..3a231724d5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,26 +27,37 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype2; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java index 3a5159b5321f..53c98fb1baea 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java index 01ac206d5737..788e564a67b4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java index 03d53d292b54..16d893982d4a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index a45860414372..f3b04035f782 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -28,14 +29,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +79,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 4096ed731e5c..f5a6a9feb64b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 712d4eddf40e..3a231724d5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,26 +27,37 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype2; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java index 3a5159b5321f..53c98fb1baea 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java index 01ac206d5737..788e564a67b4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java index 03d53d292b54..16d893982d4a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index a45860414372..f3b04035f782 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -28,14 +29,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +79,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java index 4096ed731e5c..f5a6a9feb64b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 712d4eddf40e..3a231724d5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,26 +27,37 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype2; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java index 3a5159b5321f..53c98fb1baea 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java index 01ac206d5737..788e564a67b4 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java index 03d53d292b54..16d893982d4a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index a45860414372..f3b04035f782 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -28,14 +29,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +79,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java index 4096ed731e5c..f5a6a9feb64b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 720ab17a78c2..88875d81ec16 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 7dfcb60555e4..dc7962602a11 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index da04697c7f40..028d6129e726 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 712d4eddf40e..3a231724d5e5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,26 +27,37 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype2; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index f4eb8e1d0ee9..9c2ceac1f4c1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 0094dcec0f11..23396f487302 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 9014634361bc..64ac65367549 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 33ac83933ec6..f1dd50acf1a2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java index 3a5159b5321f..53c98fb1baea 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -37,6 +38,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2b7b3078db60..73eda34d53ec 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 64795b6e7be9..bfa5e4761f65 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index 27450de343f3..0018b55a6491 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java index 4528dfc8e114..119b56561e49 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java index 01ac206d5737..788e564a67b4 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java index d6b8ad489ba3..d922cb00c05f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java index 58c6da16b210..cae12ac8cd95 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java index 192793494acf..d8bfafebd122 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java index 0a4c34a36ab3..9a561ba6bee0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java index c64919138c3c..de561231476b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java index 51d9190ba1d2..34be422407da 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java index 3b2d962b2412..a7243ea275f8 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9731c8fa145f..a9d8ffc0faad 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java index 03d53d292b54..16d893982d4a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 5490a0b793c0..bf3bd5689cd0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java index 6d442268a61b..9884efd45a51 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e10b1e0880be..6c33f45299ec 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java index 63ddcc4c9c92..dfa32b6013ce 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java index 1fae452ab35b..a869281d30f0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java index bca1d461a7a7..040aeb71b563 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java index 6145ea570fd7..6daf1d0cbfc0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java index 858ff9f32264..444f9fabbf8b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java index bdcefeff1cd5..aadbcdf1654d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java index fc6f079791bd..7e83ff30d5d7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index a45860414372..f3b04035f782 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -28,14 +29,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +79,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java index e454c7218cb3..756046385d0f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java index 4096ed731e5c..f5a6a9feb64b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java index ba2a8f964ae3..4bbe75021cfe 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java index 0dca2496eed8..f6d8d0aa5ac7 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Category id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java index 025c3131e6b0..178abdc4d65f 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java index a47eae866cb7..0eb902cf011a 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean complete; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java index a45860414372..f3b04035f782 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -28,14 +29,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +79,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public Pet() { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java index f549f3c5c605..9278d09ca95c 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java index 81c5addda07d..a60d2bdc7b26 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index b783933e9ca6..79fd291860c4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesAnyType name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index b3caa8ea24e7..87e23ed8bde3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesArray name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 6ae44d3e6e4b..6117f16cf824 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesBoolean name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 3c580305423d..dbd8ab911720 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional anytype1 = Optional.empty(); private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional anytype3 = Optional.empty(); public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 59528f660103..245aa7988636 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesInteger name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index f732d59267b4..8898634de5ac 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesNumber name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 5b60b4ee7702..9ec6ada0c6ab 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesObject name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index aa0f4d0669b2..18869596f089 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public AdditionalPropertiesString name(String name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index 099e66b38aa0..869a82eaf575 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional color = Optional.of("red"); public Animal() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index a9146888feab..311b66921411 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index fad17f0734ca..f4ac39427106 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index baba884081dc..88213c5366bf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index 2b2c13d0cf2b..83dafb15a491 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional kind = Optional.empty(); public BigCat() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index f7c601236810..af7c60d42cb6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional smallCamel = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional capitalCamel = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional smallSnake = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional capitalSnake = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional scAETHFlowPoints = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional ATT_NAME = Optional.empty(); public Capitalization smallCamel(String smallCamel) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 2b176c329d39..47362c55eda9 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional declawed = Optional.empty(); public Cat() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index a8fefab01c7b..4b8e68cc01ed 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); private String name = "default-name"; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java index c46748737fe6..6fc74dbf446c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional otherProperty = Optional.empty(); public ChildWithNullable otherProperty(String otherProperty) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index 44830cf44680..c8a9d2a09d21 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional propertyClass = Optional.empty(); public ClassModel propertyClass(String propertyClass) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index f7c344f86a39..452a9d8caba3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional client = Optional.empty(); public Client client(String client) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 706b25e1c6cf..844b74a1cdb0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional breed = Optional.empty(); public Dog() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index e461c38256a8..e24d2ba47f0d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional justSymbol = Optional.empty(); /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 7efaaa4914ad..c6a961493ea4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional enumString = Optional.empty(); /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional enumInteger = Optional.empty(); /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional enumNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional outerEnum = Optional.empty(); public EnumTest() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index aec92a61888f..1a0a4b3f5369 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional sourceURI = Optional.empty(); public File sourceURI(String sourceURI) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 9b77963d3d02..85e2d415447e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional file = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(File file) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index 2e20c15d6841..3f2f392c7a18 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@Min(value = 10) @Max(value = 100) Integer> integer = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@Min(value = 20) @Max(value = 200) Integer> int32 = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional int64 = Optional.empty(); private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@DecimalMin(value = "54.3") @DecimalMax(value = "987.6") Float> _float = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@DecimalMin(value = "67.8") @DecimalMax(value = "123.4") Double> _double = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@Pattern(regexp = "[a-zA-Z]") String> string = Optional.empty(); private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional binary = Optional.empty(); @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Optional dateTime = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional uuid = Optional.empty(); private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional bigDecimal = Optional.empty(); public FormatTest() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 23463956803a..7237d6fb3543 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional bar = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional foo = Optional.empty(); public HasOnlyReadOnly bar(String bar) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index da9b2dc1cef9..a455cf59626b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index c166e9590e39..5442f070655e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional uuid = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Optional dateTime = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 175f84e38476..81ba3b3fe307 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional propertyClass = Optional.empty(); public Model200Response name(Integer name) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index f668e82ce532..358b80624a6c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional code = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional type = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional message = Optional.empty(); public ModelApiResponse code(Integer code) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index be27413f8343..473cc3f1e9b9 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional _123list = Optional.empty(); public ModelList _123list(String _123list) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index ca03fc8b3293..77b8fd60b4e1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional _return = Optional.empty(); public ModelReturn _return(Integer _return) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index 566630f3d710..8cbb198a9826 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional snakeCase = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional property = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional _123number = Optional.empty(); public Name() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index 1e0fbfb1940e..24a4c7f0d7c0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional justNumber = Optional.empty(); public NumberOnly justNumber(BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 8d11cf44dbe8..53e139d8c956 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional petId = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional quantity = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Optional shipDate = Optional.empty(); @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional status = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional complete = Optional.of(false); public Order id(Long id) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index c3e0ef50004a..442ffabd6685 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional myNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional myString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional myBoolean = Optional.empty(); public OuterComposite myNumber(BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java index 20e13cfd8fb2..78a10d67169a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional type = Optional.empty(); private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index 788e2b6dfe9b..1890a5c2de32 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional category = Optional.empty(); private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private Optional status = Optional.empty(); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 7427c8cfe2ba..7ae10531c459 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional bar = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional baz = Optional.empty(); public ReadOnlyFirst bar(String bar) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index 267c9ff9f3c9..710947016660 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional normalPropertyName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional UPPER_CASE_PROPERTY_SNAKE = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional lowerCasePropertyDashes = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional propertyNameWithSpaces = Optional.empty(); public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index de5096f2c6df..325ba8a934e4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional $specialPropertyName = Optional.empty(); public SpecialModelName $specialPropertyName(Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index e209242db523..399b128f0813 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional name = Optional.empty(); public Tag id(Long id) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index 97f7e16a08d6..02b57c19fe99 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional username = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional firstName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional lastName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional email = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional password = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional phone = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional userStatus = Optional.empty(); public User id(Long id) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index c9a212a8fc65..0207e3a343bb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional attributeString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional attributeNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional attributeInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional attributeBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional nameString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional nameNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional nameInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional nameBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional namespaceString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional namespaceNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional namespaceInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional namespaceBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixNsString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixNsNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixNsInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Optional prefixNsBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java index a708e0f4a8b9..4c25aa10fcf7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java index 4de8392cb969..1487c6aac8f3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.List; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java index a20dd6aad822..1e163d719d92 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index 71fdfba0ab67..238987217a16 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -29,26 +30,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java index 1b4862aece5f..eb8ba92e6763 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java index 6b416781e0ff..94006ce56c49 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java index f0c034a08414..4a5b23614b11 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.Map; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java index aa85f6753bf9..12592efc943d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java index 183b387debdd..9c5a0770cd44 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class Animal { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index 0647136d16e5..71d5a0421b9f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index 9aa0df5b402d..772764562e38 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index 3463b75302a6..de3b69dd7559 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.util.ArrayList; @@ -26,10 +27,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java index fbaa4e76121a..a7aa631bbbb0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -67,6 +68,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java index 76d202c34658..e31a8d1a03b1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,16 +23,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java index f3b0c1935972..709e4bbb27cf 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -35,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java index b6f8fb66bdb1..9ceaff3c1d7f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java index 3a32afeb4926..dc0bf9d1f9a2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -30,6 +31,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java index 143b0e309e33..711aec0032fb 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java index ab86b6806b61..8857897f6550 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java index aabb55bd6997..b37830effd44 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java index fa003311eae6..cb034a3665f1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -61,6 +62,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java index 533d852f4eed..c87b1de853ed 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,8 +179,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnum outerEnum; public EnumTest() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java index 658e29e0b1b0..4fa49ca09472 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index d7fa83f423a9..d4c0af886597 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.io.File; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java index 07581390a665..0f9e6d87f971 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTest() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java index 0c326f4e5cc5..32a3524267da 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java index 5c66ea935076..4e094ae6a21c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index edac7a8e1283..5e51745b1128 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.time.OffsetDateTime; @@ -28,11 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java index 6eb8a2e91bb8..904637286de1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java index 7b988f850357..8cc3cc77ed4e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java index 65efa804af2e..7f330e9d69a9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java index d54fb5ee02e5..5e3d3d2f7707 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java index 07e2cbcacdaa..696761c60599 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -25,10 +26,13 @@ public class Name { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123number; public Name() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java index c11a76fe1f40..0742cd5e88b6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java index 3389ed8f080d..9df3450b03bf 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -71,8 +76,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public Order id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java index ba8e8b028ca0..a8029f1b07db 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -23,10 +24,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java index f4bd1f1d2e7d..7d014d107bda 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -71,6 +72,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index c9d88f917236..1a0f2a85ea02 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -31,14 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +82,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java index 32a60515a39d..6286f1c8122e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java index 91dac13d1af0..20dcf71bea16 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java index ceef64ec1bf6..759262d25886 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java index 7c10484faecb..1e954d1231ea 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java index 47e35a618833..0d665d7ebca8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -22,20 +23,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public User id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java index c3663cebdf14..fc98407ae661 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import java.math.BigDecimal; @@ -26,62 +27,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index f4aeeac9e693..8b4ffdda85b1 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapProperty = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapOfMapProperty = new HashMap<>(); public AdditionalPropertiesClassDto mapProperty(Map mapProperty) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AllOfWithSingleRefDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AllOfWithSingleRefDto.java index 4da9ab881ff2..2f023c0e2321 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AllOfWithSingleRefDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AllOfWithSingleRefDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AllOfWithSingleRefDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable SingleRefTypeDto singleRefType; public AllOfWithSingleRefDto username(@Nullable String username) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AnimalDto.java index 459748566e61..53065f09fd0c 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -38,6 +39,7 @@ public class AnimalDto implements com.custompackage.InterfaceToKeep, com.customp private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ApiResponseDto.java index fcb68e6d7ddb..4f453f595b33 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index d94eefae55d0..5dce20e2d7e1 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 3933a17b0591..6d8f6dad14a3 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java index 95eba82ef7ca..97d7bdf5d69a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,10 +29,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CapitalizationDto.java index a49afa0b1df1..715f319e8816 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CatDto.java index b9f29dc75753..0fd8994aae2a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CategoryDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CategoryDto.java index 33c0f626691d..dfafac8e76bb 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 9d2dc6efb55f..de757a77d844 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -32,6 +33,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClassModelDto.java index f2f095548a79..7ea028ddf3ed 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClientDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClientDto.java index 43c968f54333..8d416bfa65ed 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ClientDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DeprecatedObjectDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DeprecatedObjectDto.java index 4a3513533f55..13460f65e20b 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DeprecatedObjectDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DeprecatedObjectDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DeprecatedObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public DeprecatedObjectDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DogDto.java index 223d2b6af650..a912f69fd0ce 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/DogDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumArraysDto.java index f3df15bdd3ce..b5a0a0c2641c 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -63,6 +64,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,6 +102,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java index ae172afa878e..450dca6a6675 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -69,6 +70,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -145,6 +147,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -182,14 +185,18 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; private JsonNullable outerEnum = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumIntegerDto outerEnumInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private OuterEnumDefaultValueDto outerEnumDefaultValue = OuterEnumDefaultValueDto.PLACED; + @JsonInclude(JsonInclude.Include.NON_NULL) private OuterEnumIntegerDefaultValueDto outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueDto.NUMBER_0; public EnumTestDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java index 4d432b87308c..0a84ad65ca64 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,8 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FakeBigDecimalMap200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal someId; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map someMap = new HashMap<>(); public FakeBigDecimalMap200ResponseDto someId(@Nullable BigDecimal someId) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileDto.java index 1330a3c5005d..5a1f92a4e7f2 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 4c540dba13f8..94fc92c39123 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,8 +29,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooDto.java index 5bc1e20d8b55..724f4fdf0004 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FooDto implements com.custompackage.WithBar, com.custompackage.WithDefaultMethod { + @JsonInclude(JsonInclude.Include.NON_NULL) private String bar = "bar"; public FooDto bar(String bar) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooGetDefaultResponseDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooGetDefaultResponseDto.java index a6e2c94b1d2a..76d990dd8fee 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooGetDefaultResponseDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FooGetDefaultResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FooGetDefaultResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FooDto string; public FooGetDefaultResponseDto string(@Nullable FooDto string) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FormatTestDto.java index 7f0c67f0571b..a4b703ef56d2 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,38 +31,50 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal decimal; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String patternWithDigits; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String patternWithDigitsAndDelimiter; public FormatTestDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 9c91860d45c6..afbdef40b22e 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ListDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ListDto.java index 41d483534b6c..2d5af90a0763 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ListDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123List; public ListDto _123List(@Nullable String _123List) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java index 3a6f4c542ff6..33f6b3a6e68e 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,10 +66,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 6a28d5dd1c0d..d87338349de9 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,11 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/Model200ResponseDto.java index 16bd4ad4c604..b5802b404ddf 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NameDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NameDto.java index 4819e0f028d6..a30723fc62ed 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,10 +28,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123Number; public NameDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java index 849cf46fcf26..129638607174 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -57,12 +58,14 @@ public class NullableClassDto { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItemsNullable = new ArrayList<>(); private JsonNullable> objectNullableProp = JsonNullable.>undefined(); private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map objectItemsNullable = new HashMap<>(); public NullableClassDto integerProp(Integer integerProp) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NumberOnlyDto.java index a1b3ab47eb4b..69c7fd876b87 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java index c0821273f4e7..7d716b4fd90a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,14 +30,18 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ObjectWithDeprecatedFieldsDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable BigDecimal id; + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable DeprecatedObjectDto deprecatedRef; + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private List bars = new ArrayList<>(); diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OrderDto.java index 7ce59385f5e4..4ff315109f90 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OrderDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,12 +28,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -73,8 +78,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterCompositeDto.java index 8171e15f3a50..6f9c422855d9 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 294c9b5b0ea4..0aaf5955bc17 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -72,6 +73,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java index 543e0e2b0775..b034d956c9ea 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -33,14 +34,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -80,6 +84,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; public PetDto() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index f66688e5de44..ad454607b049 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReturnDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReturnDto.java index 1e52e875229d..6944ea631fd9 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 52aea10dde40..59002621b577 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $SpecialPropertyName; public SpecialModelNameDto $SpecialPropertyName(@Nullable Long $SpecialPropertyName) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TagDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TagDto.java index c60a1d638332..b1a6e4010941 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TagDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequestDto.java index 7994dcdf705d..a565a1b9cdfc 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TestInlineFreeformAdditionalPropertiesRequestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String someProperty; public TestInlineFreeformAdditionalPropertiesRequestDto someProperty(@Nullable String someProperty) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/UserDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/UserDto.java index 4306aaa2641f..b9aa23db6e3e 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/UserDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,20 +25,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java index 3e0d01807d03..e5bfdeed38af 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java index 0a388f33860b..b8fa5e865450 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java index c15386d5280a..457f951773f7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 96ec598b162d..007ab07daf36 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -31,26 +32,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java index 4084ee94ba3a..362f6b669661 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java index eedff3efe549..eebe0f7142cc 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java index 6f8f96bb9c9d..beba0cff861f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java index 6ad0c25e8270..c3abe1682115 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java index fbc28b5b7f7a..045f3ebb64c2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -39,6 +40,7 @@ public class AnimalDto { private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java index b38d9a69fc07..057933f73a6a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,10 +25,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 2b0499b1168e..72d261ce0d40 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index e0ed6d0fa96c..ff7c75d3ac06 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java index afd8245a6808..e2ca7ed41dda 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,10 +29,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java index 5530bc825bf4..dc278d546f7a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -70,6 +71,7 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java index 683a2b1f7f34..3fc502216477 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java index 7b3be944da3c..64997301aba8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -36,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java index b603fa6a361b..5b88858fabab 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java index cb8a9004484f..0fef0c2aef70 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -32,6 +33,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java index 91b9b65b91cb..80a6d0e0f70d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java index 95bdfe91419d..17ce8c5c389b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java index c391eeafc9c5..1eb00f6ee538 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -29,6 +30,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java index 8436327150c5..d6d73e29d965 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -64,6 +65,7 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -101,6 +103,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java index 91caf18fd185..d06e60152d3c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -64,6 +65,7 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -140,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -177,8 +180,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java index d8edd8c6aa09..03b94119cdbe 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index 018f4b5bf6ea..3eb96f3affab 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,8 +29,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java index e4b5d5921eb2..2b9ad4a9df71 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,34 +31,44 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java index 5c2540e52c70..4dd86cd5156f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java index 9369373f4532..d61f097bf42f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123List; public ListDto _123List(@Nullable String _123List) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java index b9c92638f3c1..395764b93bcd 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,10 +66,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 231b2791fe74..a4f629112c7f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -30,11 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java index fc1504f581c4..180957494276 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,8 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java index 2318e6be5769..99abcbbc5d72 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -27,10 +28,13 @@ public class NameDto { private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _123Number; public NameDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java index 82efb4c168ba..29f5b65cdd61 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java index bbad147e5c8e..bc3c9ebfa5c1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,12 +29,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -74,8 +79,10 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean complete = false; public OrderDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java index c8d5aceeffc3..36414fd01c69 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,10 +26,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java index f53327a1d351..db02cf62c417 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -73,6 +74,7 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private JsonNullable nullableProperty = JsonNullable.undefined(); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index c3828e3f77ec..23b7dc65c987 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,14 +35,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; private String name; private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -81,6 +85,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java index c8db82b9e5db..79f935c3712f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java index 39f1e5b53890..427b5a93edb1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,12 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java index bd4ef08916f7..e1bcaff8b39e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java index 2989435b1b5b..a6cfacd4bd34 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $SpecialPropertyName; public SpecialModelNameDto $SpecialPropertyName(@Nullable Long $SpecialPropertyName) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java index 6794c4da65f4..965ae7b098d6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java index 175325354042..b2fc97bafd44 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -24,20 +25,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java index 0ad6bf4d1074..ad2228db2adb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -28,62 +29,91 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.24.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) {