From f2cf01f56e0b42546a5b2afe9c1e8b9cc88350d8 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 11:59:16 +0200 Subject: [PATCH 01/20] feat(json-include): introduce configurable JsonInclude policy for optional non-nullable properties --- .../languages/KotlinSpringServerCodegen.java | 105 ++++++++- .../codegen/languages/SpringCodegen.java | 95 ++++++-- .../main/resources/JavaSpring/pojo.mustache | 11 +- .../kotlin-spring/dataClassOptVar.mustache | 5 +- .../kotlin-spring/dataClassReqVar.mustache | 3 +- .../java/spring/SpringCodegenTest.java | 204 +++++++++++++++--- .../spring/KotlinSpringServerCodegenTest.java | 177 +++++++++++++-- .../issue_24401_json_include_override.yaml | 30 +++ .../issue_24401_json_include_per_schema.yaml | 81 +++++++ 9 files changed, 645 insertions(+), 66 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_override.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml 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 4227feda5942..08555c967cd9 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 @@ -111,6 +111,14 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String USE_SEALED_RESPONSE_INTERFACES = "useSealedResponseInterfaces"; public static final String COMPANION_OBJECT = "companionObject"; public static final String SUSPEND_FUNCTIONS = "suspendFunctions"; + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; + /** + * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy + * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. + * A value set directly in the spec is treated as a manual override and always wins. + */ + public static final String JSON_INCLUDE_POLICY_EXTENSION = "x-jackson-json-include-policy"; @Getter public enum DeclarativeInterfaceReactiveMode { @@ -183,6 +191,8 @@ public String getDescription() { @Setter private boolean useEnumValueInterface = false; private String valuedEnumClassName = "ValuedEnum"; @Setter private boolean suspendFunctions = false; + @Getter @Setter private String optionalNonNullPropertyJsonInclude = "NON_NULL"; + @Getter @Setter private boolean generateJsonIncludeAnnotations = true; @Getter @Setter private boolean openApiNullable = false; @Getter @Setter protected boolean useDeductionForOneOfInterfaces = false; @@ -314,6 +324,22 @@ public KotlinSpringServerCodegen() { substituteGenericPagedModel); addSwitch(COMPANION_OBJECT, "Whether to generate companion objects in data classes, enabling companion extensions.", companionObject); addSwitch(SUSPEND_FUNCTIONS, "Whether to generate suspend functions for API operations. Useful for Spring MVC with Kotlin coroutines without requiring the full reactive stack.", suspendFunctions); + + CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, + "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. " + + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_DEFAULT", "Omit the property when its value equals the default."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NONE", "Emit no @JsonInclude annotation; defer to the global ObjectMapper."); + optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude); + cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); + + addSwitch(GENERATE_JSON_INCLUDE_ANNOTATIONS, + "Whether to generate policy @JsonInclude annotations on model properties. When false, all " + + "automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) " + + "are omitted so the global ObjectMapper owns inclusion. A per-property override set via the " + + "`x-jackson-json-include-policy` vendor extension is still honored.", generateJsonIncludeAnnotations); 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, @@ -733,6 +759,16 @@ public void processOpts() { } writePropertyBack(SUSPEND_FUNCTIONS, suspendFunctions); + if (additionalProperties.containsKey(GENERATE_JSON_INCLUDE_ANNOTATIONS)) { + this.setGenerateJsonIncludeAnnotations(convertPropertyToBoolean(GENERATE_JSON_INCLUDE_ANNOTATIONS)); + } + writePropertyBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, generateJsonIncludeAnnotations); + if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { + this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); + } + this.optionalNonNullPropertyJsonInclude = normalizeJsonIncludePolicy(this.optionalNonNullPropertyJsonInclude); + writePropertyBack(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); + if (additionalProperties.containsKey(BEAN_QUALIFIERS) && library.equals(SPRING_BOOT)) { this.setBeanQualifiers(convertPropertyToBoolean(BEAN_QUALIFIERS)); } @@ -1285,6 +1321,9 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // 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. + // 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). if (!property.required && !property.isNullable) { if (openApiNullable) { property.vendorExtensions.put("x-has-json-setter-nulls-fail", true); @@ -1293,7 +1332,6 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } model.imports.add("JsonSetter"); model.imports.add("Nulls"); - model.imports.add("JsonInclude"); } // Scenario 4: optional + nullable with openApiNullable → use JsonNullable = JsonNullable.undefined() @@ -1303,6 +1341,8 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert model.imports.add("JsonNullable"); } + resolveJsonIncludePolicy(model, property); + //Add imports for Jackson if (!model.isEnum) { model.imports.add("JsonProperty"); @@ -1322,6 +1362,65 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } } + /** + * Resolve the {@code @JsonInclude} policy into the single universal + * {@code x-jackson-json-include-policy} vendor extension the template emits. Precedence: + *
    + *
  1. A value set directly on the property (manual override in the spec) always wins.
    2. + *
  2. Otherwise, when {@code generateJsonIncludeAnnotations=true}, apply the automatic matrix: + *
      + *
    • required (nullable or not) → {@code ALWAYS} (Kotlin type prevents null for non-nullable; + * explicit null is valid for nullable and must be serialized)
      • + *
    • optional & non-nullable → {@code optionalNonNullPropertyJsonInclude} + * (default {@code NON_NULL}, {@code NONE} = omit)
      • + *
    • optional & nullable → none (JsonNullable module already governs inclusion)
      • + *
    + *
    3. + *
+ */ + private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property) { + if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { + if (isJsonIncludePolicyEmitted(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION))) { + model.imports.add("JsonInclude"); + } + return; + } + if (!generateJsonIncludeAnnotations) { + return; + } + String policy = null; + if (property.required) { + policy = "ALWAYS"; + } else if (!property.isNullable) { + policy = optionalNonNullPropertyJsonInclude; + } + if (isJsonIncludePolicyEmitted(policy)) { + property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, policy); + model.imports.add("JsonInclude"); + } + } + + private static boolean isJsonIncludePolicyEmitted(Object policy) { + return policy != null && !policy.toString().isEmpty() && !"NONE".equalsIgnoreCase(policy.toString()); + } + + private static String normalizeJsonIncludePolicy(String policy) { + if (policy == null) { + return "NON_NULL"; + } + String normalized = policy.trim().toUpperCase(Locale.ROOT); + switch (normalized) { + case "NON_NULL": + case "NON_EMPTY": + case "NON_DEFAULT": + case "NONE": + return normalized; + default: + throw new IllegalArgumentException(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + + " must be one of NON_NULL, NON_EMPTY, NON_DEFAULT, NONE but was: " + policy); + } + } + @Override public void addImportsToOneOfInterface(List> imports) { if (additionalProperties.containsKey("jackson")) { @@ -1479,6 +1578,10 @@ public ModelsMap postProcessModelsEnum(ModelsMap objs) { if (openApiNullable && !var.required && var.isNullable) { var.vendorExtensions.put("x-is-jackson-optional-nullable", true); } + resolveJsonIncludePolicy(cm, var); + } + for (CodegenProperty var : cm.requiredVars) { + resolveJsonIncludePolicy(cm, var); } } 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 1ab10fd19d09..9c401db07d4a 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 @@ -123,6 +123,14 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String GENERATE_PAGEABLE_CONSTRAINT_VALIDATION = "generatePageableConstraintValidation"; public static final String SUBSTITUTE_GENERIC_PAGED_MODEL = "substituteGenericPagedModel"; public static final String CLIENT_REGISTRATION_ID = "clientRegistrationId"; + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; + /** + * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy + * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. + * A value set directly in the spec is treated as a manual override and always wins. + */ + public static final String JSON_INCLUDE_POLICY_EXTENSION = "x-jackson-json-include-policy"; @Getter public enum RequestMappingMode { @@ -161,6 +169,8 @@ public enum RequestMappingMode { @Setter protected boolean apiFirst = false; protected boolean useOptional = false; @Setter protected boolean useSealed = false; + @Getter @Setter protected String optionalNonNullPropertyJsonInclude = "NON_NULL"; + @Getter @Setter protected boolean generateJsonIncludeAnnotations = true; @Setter protected boolean virtualService = false; @Setter protected boolean hateoas = false; @Setter protected boolean returnSuccessCode = false; @@ -284,6 +294,22 @@ public SpringCodegen() { "Use Bean Validation Impl. to perform BeanValidation", performBeanValidation)); cliOptions.add(CliOption.newBoolean(USE_SEALED, "Whether to generate sealed model interfaces and classes")); + + CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, + "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. " + + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_DEFAULT", "Omit the property when its value equals the default."); + optionalNonNullPropertyJsonIncludeOpt.addEnum("NONE", "Emit no @JsonInclude annotation; defer to the global ObjectMapper."); + optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude); + cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); + + cliOptions.add(CliOption.newBoolean(GENERATE_JSON_INCLUDE_ANNOTATIONS, + "Whether to generate policy @JsonInclude annotations on model properties. When false, all " + + "automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) " + + "are omitted so the global ObjectMapper owns inclusion. A per-property override set via the " + + "`x-jackson-json-include-policy` vendor extension is still honored.", generateJsonIncludeAnnotations)); cliOptions.add(CliOption.newBoolean(API_FIRST, "Generate the API from the OAI spec at server compile time (API first approach)", apiFirst)); cliOptions @@ -558,6 +584,12 @@ public void processOpts() { convertPropertyToBooleanAndWriteBack(RETURN_SUCCESS_CODE, this::setReturnSuccessCode); convertPropertyToBooleanAndWriteBack(USE_SWAGGER_UI, this::setUseSwaggerUI); convertPropertyToBooleanAndWriteBack(USE_SEALED, this::setUseSealed); + convertPropertyToBooleanAndWriteBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, this::setGenerateJsonIncludeAnnotations); + if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { + this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); + } + this.optionalNonNullPropertyJsonInclude = normalizeJsonIncludePolicy(this.optionalNonNullPropertyJsonInclude); + additionalProperties.put(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); if (DocumentationProvider.NONE.equals(getDocumentationProvider())) { this.setUseSwaggerUI(false); } @@ -1213,21 +1245,58 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert 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"); + // Optional + non-nullable, when openApiNullable=false: add @JsonSetter(nulls = Nulls.SKIP) on the + // setter so an explicit null in the payload does not overwrite the field's default. + if (!property.required && !property.isNullable && !openApiNullable) { + property.vendorExtensions.put("x-has-json-setter-nulls-skip", true); + model.imports.add("JsonSetter"); + model.imports.add("Nulls"); + } + + // Resolve the @JsonInclude policy into the single universal x-jackson-json-include-policy vendor + // extension the template emits. Precedence: + // 1. A value set directly on the property (manual override in the spec) always wins. + // 2. Otherwise, when generateJsonIncludeAnnotations=true, apply the automatic matrix: + // required & non-nullable -> NON_NULL (contract protection; omit rather than emit invalid null) + // required & nullable -> ALWAYS (explicit null is valid and must be serialized) + // optional & non-nullable -> optionalNonNullPropertyJsonInclude (default NON_NULL, NONE = omit) + // optional & nullable -> none (JsonNullable module already governs inclusion) + if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { + if (isJsonIncludePolicyEmitted(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION))) { + model.imports.add("JsonInclude"); + } + } else if (generateJsonIncludeAnnotations) { + String policy = null; + if (property.required) { + policy = property.isNullable ? "ALWAYS" : "NON_NULL"; + } else if (!property.isNullable) { + policy = optionalNonNullPropertyJsonInclude; + } + if (isJsonIncludePolicyEmitted(policy)) { + property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, policy); + model.imports.add("JsonInclude"); } } - // Optional + nullable with openApiNullable: emit @JsonInclude(NON_ABSENT) so that - // JsonNullable.undefined() is excluded from serialized output. - if (openApiNullable && !property.required && property.isNullable) { - model.imports.add("JsonInclude"); + } + + private static boolean isJsonIncludePolicyEmitted(Object policy) { + return policy != null && !policy.toString().isEmpty() && !"NONE".equalsIgnoreCase(policy.toString()); + } + + private static String normalizeJsonIncludePolicy(String policy) { + if (policy == null) { + return "NON_NULL"; + } + String normalized = policy.trim().toUpperCase(Locale.ROOT); + switch (normalized) { + case "NON_NULL": + case "NON_EMPTY": + case "NON_DEFAULT": + case "NONE": + return normalized; + default: + throw new IllegalArgumentException(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + + " must be one of NON_NULL, NON_EMPTY, NON_DEFAULT, NONE but was: " + policy); } } diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 6dd2e6da00d2..bfd4acbfc98b 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -62,14 +62,9 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{{.}}} {{/vendorExtensions.x-field-extra-annotation}} {{#jackson}} - {{^required}} - {{^isNullable}} - @JsonInclude(JsonInclude.Include.NON_NULL) - {{/isNullable}} - {{/required}} - {{#vendorExtensions.x-is-jackson-optional-nullable}} - @JsonInclude(JsonInclude.Include.NON_ABSENT) - {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{#vendorExtensions.x-jackson-json-include-policy}} + @JsonInclude(JsonInclude.Include.{{{vendorExtensions.x-jackson-json-include-policy}}}) + {{/vendorExtensions.x-jackson-json-include-policy}} {{/jackson}} {{#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 900c2e3f4662..78380ea41ac9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache @@ -2,9 +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}}{{^isNullable}} - @field:JsonInclude(JsonInclude.Include.NON_NULL){{/isNullable}}{{#vendorExtensions.x-is-jackson-optional-nullable}} - @field:JsonInclude(JsonInclude.Include.NON_ABSENT){{/vendorExtensions.x-is-jackson-optional-nullable}}{{#vendorExtensions.x-has-json-setter-nulls-skip}} + {{{.}}}{{/vendorExtensions.x-field-extra-annotation}}{{#vendorExtensions.x-jackson-json-include-policy}} + @field:JsonInclude(JsonInclude.Include.{{{vendorExtensions.x-jackson-json-include-policy}}}){{/vendorExtensions.x-jackson-json-include-policy}}{{#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}} @param:JsonProperty("{{{baseName}}}") diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache index 2f07705c6dd0..e299d4582a3c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache @@ -1,6 +1,7 @@ {{#useBeanValidation}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}} @Schema({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{.}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}} @ApiModelProperty({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{.}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swagger1AnnotationLibrary}}{{#vendorExtensions.x-field-extra-annotation}} - {{{.}}}{{/vendorExtensions.x-field-extra-annotation}} + {{{.}}}{{/vendorExtensions.x-field-extra-annotation}}{{#vendorExtensions.x-jackson-json-include-policy}} + @field:JsonInclude(JsonInclude.Include.{{{vendorExtensions.x-jackson-json-include-policy}}}){{/vendorExtensions.x-jackson-json-include-policy}} @param:JsonProperty("{{{baseName}}}") @get:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInPascalCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{^isNumber}}{{{defaultValue}}}{{/isNumber}}{{#isNumber}}{{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{/defaultValue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 2193ee5c9f9f..a3f5e136f066 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -8294,57 +8294,213 @@ void issue24003() throws IOException { } /** - * Scenario 4 (openApiNullable=true): optional+nullable field must carry - * {@code @JsonInclude(JsonInclude.Include.NON_ABSENT)} so that Jackson - * excludes {@code JsonNullable.undefined()} from serialized output. + * Issue #24401: the {@code @JsonInclude(NON_ABSENT)} annotation must no longer be emitted for + * {@code JsonNullable} fields, as the JsonNullable module already governs their inclusion. */ @Test - void optionalNullableField_withOpenApiNullable_hasNonAbsentAnnotation() throws IOException { + void optionalNullableField_withOpenApiNullable_hasNoJsonIncludeAnnotation() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); Path modelFile = files.get("TestModel.java").toPath(); - // NON_ABSENT must be present — only optionalNullable (JsonNullable) gets this annotation - assertFileContains(modelFile, "@JsonInclude(JsonInclude.Include.NON_ABSENT)"); - // JsonNullable field must be present - assertFileContains(modelFile, "private JsonNullable optionalNullable"); - // NON_NULL must also be present (for optionalNonNullable fields) - assertFileContains(modelFile, "@JsonInclude(JsonInclude.Include.NON_NULL)"); - assertFileContains(modelFile, "import com.fasterxml.jackson.annotation.JsonInclude"); + assertFileNotContains(modelFile, "@JsonInclude(JsonInclude.Include.NON_ABSENT)"); + JavaFileAssert.assertThat(files.get("TestModel.java")) + .assertProperty("optionalNullable").withType("JsonNullable") + .assertPropertyAnnotations().doesNotContainWithName("JsonInclude"); } /** - * Without openApiNullable the optional+nullable field is a plain nullable type — - * no {@code @JsonInclude(NON_ABSENT)} should be emitted. + * Issue #24401: default matrix for JAVA-SPRING (openApiNullable=true). + * required non-nullable -> NON_NULL, required nullable -> ALWAYS, + * optional non-nullable -> NON_NULL (default policy), optional nullable -> no annotation. */ @Test - void optionalNullableField_withoutOpenApiNullable_hasNoNonAbsentAnnotation() throws IOException { + void jsonInclude_defaultMatrix() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, - Map.of(CodegenConstants.OPENAPI_NULLABLE, "false")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); - Path modelFile = files.get("TestModel.java").toPath(); - // Without openApiNullable the field is String optionalNullable, not JsonNullable - assertFileNotContains(modelFile, "@JsonInclude(JsonInclude.Include.NON_ABSENT)"); + JavaFileAssert.assertThat(files.get("TestModel.java")) + .assertProperty("requiredNonNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_NULL")).toProperty().toType() + .assertProperty("requiredNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.ALWAYS")).toProperty().toType() + .assertProperty("optionalNonNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_NULL")).toProperty().toType() + .assertProperty("optionalNullable").assertPropertyAnnotations() + .doesNotContainWithName("JsonInclude"); } /** - * Optional+non-nullable fields must still have {@code @JsonInclude(NON_NULL)} regardless - * of the openApiNullable setting. + * Issue #24401: {@code optionalNonNullPropertyJsonInclude} changes the policy emitted for + * optional non-nullable properties. */ @Test - void optionalNonNullableField_alwaysHasNonNullAnnotation() throws IOException { + void jsonInclude_optionalNonNullPolicy_nonEmpty() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, - Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NON_EMPTY")); + + JavaFileAssert.assertThat(files.get("TestModel.java")) + .assertProperty("optionalNonNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_EMPTY")).toProperty().toType() + // required-field protection is unaffected by the optional policy + .assertProperty("requiredNonNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_NULL")); + } + + /** + * Issue #24401: {@code optionalNonNullPropertyJsonInclude=NONE} emits no annotation on optional + * non-nullable properties, deferring to the global ObjectMapper. Required-field protection stays. + */ + @Test + void jsonInclude_optionalNonNullPolicy_none() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); + + JavaFileAssert.assertThat(files.get("TestModel.java")) + .assertProperty("optionalNonNullable").assertPropertyAnnotations() + .doesNotContainWithName("JsonInclude").toProperty().toType() + .assertProperty("requiredNonNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_NULL")); + } + + /** + * Issue #24401: {@code generateJsonIncludeAnnotations=false} removes ALL policy @JsonInclude + * annotations, including the required-field protection, letting the global ObjectMapper win. + */ + @Test + void jsonInclude_generateJsonIncludeAnnotations_false() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); Path modelFile = files.get("TestModel.java").toPath(); - assertFileContains(modelFile, "@JsonInclude(JsonInclude.Include.NON_NULL)"); - assertFileContains(modelFile, "private String optionalNonNullable"); + assertFileNotContains(modelFile, "@JsonInclude("); + } + + /** + * Issue #24401: a manual per-property {@code x-jackson-json-include-policy} vendor extension + * always overrides the automatic behavior, even when {@code generateJsonIncludeAnnotations=false}. + */ + @Test + void jsonInclude_manualOverride_winsOverGenerateFlag() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_override.yaml", + SPRING_BOOT, + Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + + JavaFileAssert.assertThat(files.get("TestModel.java")) + .assertProperty("overridden").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_EMPTY")).toProperty().toType() + // no automatic annotation on the non-overridden optional field + .assertProperty("plain").assertPropertyAnnotations() + .doesNotContainWithName("JsonInclude"); + } + + /** + * Issue #24401: with one property per schema, each generated model must import exactly the + * Jackson annotations its single property needs — no more, no less. + */ + @Test + void jsonInclude_perSchemaImports() throws IOException { + final String jsonInclude = "com.fasterxml.jackson.annotation.JsonInclude"; + final String jsonSetter = "com.fasterxml.jackson.annotation.JsonSetter"; + final String nulls = "com.fasterxml.jackson.annotation.Nulls"; + final String jsonNullable = "org.openapitools.jackson.nullable.JsonNullable"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + + // required non-nullable -> @JsonInclude(NON_NULL); no setter machinery + JavaFileAssert.assertThat(files.get("RequiredNonNullable.java")) + .hasImports(jsonInclude).hasNoImports(jsonSetter, nulls); + // required nullable -> @JsonInclude(ALWAYS) + JavaFileAssert.assertThat(files.get("RequiredNullable.java")) + .hasImports(jsonInclude).hasNoImports(jsonSetter, nulls); + // optional non-nullable with openApiNullable=true -> @JsonInclude(NON_NULL), no @JsonSetter + JavaFileAssert.assertThat(files.get("OptionalNonNullable.java")) + .hasImports(jsonInclude).hasNoImports(jsonSetter, nulls); + // optional nullable with openApiNullable=true -> JsonNullable, NO @JsonInclude + JavaFileAssert.assertThat(files.get("OptionalNullable.java")) + .hasImports(jsonNullable).hasNoImports(jsonInclude, jsonSetter, nulls); + } + + /** + * Issue #24401: with openApiNullable=false, optional non-nullable adds @JsonSetter(Nulls.SKIP); + * optional nullable is a plain type needing none of the Jackson import machinery. + */ + @Test + void jsonInclude_perSchemaImports_withoutOpenApiNullable() throws IOException { + final String jsonInclude = "com.fasterxml.jackson.annotation.JsonInclude"; + final String jsonSetter = "com.fasterxml.jackson.annotation.JsonSetter"; + final String nulls = "com.fasterxml.jackson.annotation.Nulls"; + final String jsonNullable = "org.openapitools.jackson.nullable.JsonNullable"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "false")); + + // optional non-nullable -> @JsonInclude(NON_NULL) + @JsonSetter(Nulls.SKIP) + JavaFileAssert.assertThat(files.get("OptionalNonNullable.java")) + .hasImports(jsonInclude, jsonSetter, nulls).hasNoImports(jsonNullable); + // optional nullable (plain String) -> no policy annotation, no import machinery + JavaFileAssert.assertThat(files.get("OptionalNullable.java")) + .hasNoImports(jsonInclude, jsonSetter, nulls, jsonNullable); + } + + /** + * Issue #24401: even with {@code generateJsonIncludeAnnotations=false}, a manual per-property + * vendor extension must still emit its annotation AND the JsonInclude import must be present. + */ + @Test + void jsonInclude_manualOverride_emitsImport_whenAnnotationsDisabled() throws IOException { + final String jsonInclude = "com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + + JavaFileAssert.assertThat(files.get("ManualOverride.java")) + .hasImports(jsonInclude) + .assertProperty("value").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_EMPTY")); + // A schema without the override must not import JsonInclude when annotations are disabled + JavaFileAssert.assertThat(files.get("OptionalNonNullable.java")).hasNoImports(jsonInclude); + } + + /** + * Issue #24401: a forced override on an optional+nullable ({@code JsonNullable}) property must be + * respected — the annotation is emitted and the JsonInclude import is added, even though the + * automatic path emits nothing for JsonNullable fields. + */ + @Test + void jsonInclude_forcedOverride_onJsonNullable_emitsAnnotationAndImport() throws IOException { + final String jsonInclude = "com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + + JavaFileAssert.assertThat(files.get("ForcedOnJsonNullable.java")) + .hasImports(jsonInclude) + .assertProperty("value").withType("JsonNullable").assertPropertyAnnotations() + .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_NULL")); } @Test 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 c0d2cb18e3f0..079641006ed5 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 @@ -6690,28 +6690,173 @@ public void requiredNullable_scenario3_optionalNonNullable_withJackson3() throws } /** - * Scenario 4 (openApiNullable=true): optional+nullable field must carry - * {@code @field:JsonInclude(JsonInclude.Include.NON_ABSENT)} so that Jackson - * excludes {@code JsonNullable.undefined()} from serialized output. + * Issue #24401: optional+nullable ({@code JsonNullable}) fields must no longer carry + * {@code @field:JsonInclude(NON_ABSENT)} — the JsonNullable module already governs their inclusion. */ - @Test(description = "Scenario 4 – optional+nullable with openApiNullable=true: @JsonInclude(NON_ABSENT) guards undefined from serialization") - public void requiredNullable_scenario4_optionalNullable_hasNonAbsentAnnotation() throws IOException { + @Test(description = "Issue #24401 – optional+nullable with openApiNullable=true: no @JsonInclude annotation") + public void requiredNullable_scenario4_optionalNullable_hasNoJsonIncludeAnnotation() 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 optionalNullable:"); - Assert.assertTrue(idx >= 0, "optionalNullable property must exist"); - // Annotations appear before the val declaration - String context = content.substring(Math.max(0, idx - 300), idx); - Assert.assertTrue(context.contains("@field:JsonInclude(JsonInclude.Include.NON_ABSENT)"), - "optionalNullable must have @field:JsonInclude(NON_ABSENT) to suppress JsonNullable.undefined() from output"); - // Must NOT have NON_NULL — that annotation is only for non-nullable optional fields - Assert.assertFalse(context.contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), - "optionalNullable must NOT have @field:JsonInclude(NON_NULL); only non-nullable optionals use NON_NULL"); - assertFileContains(modelFile, "import com.fasterxml.jackson.annotation.JsonInclude"); + // NON_ABSENT must no longer be emitted anywhere + assertFileNotContains(modelFile, "@field:JsonInclude(JsonInclude.Include.NON_ABSENT)"); + // optionalNullable must still be a JsonNullable wrapper + assertFileContains(modelFile, "JsonNullable"); + } + + /** + * Issue #24401: default matrix for kotlin-spring. required fields -> ALWAYS, + * optional non-nullable -> NON_NULL (default policy), optional nullable -> no annotation. + */ + @Test(description = "Issue #24401 – default @JsonInclude matrix (kotlin-spring)") + public void jsonInclude_kotlinMatrix_default() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + new HashMap<>()); + + String content = Files.readString(files.get("TestModel.kt").toPath()); + Assert.assertTrue(jsonIncludeBlockFor(content, "requiredNonNullable").contains("@field:JsonInclude(JsonInclude.Include.ALWAYS)"), + "required non-nullable must be ALWAYS"); + Assert.assertTrue(jsonIncludeBlockFor(content, "requiredNullable").contains("@field:JsonInclude(JsonInclude.Include.ALWAYS)"), + "required nullable must be ALWAYS"); + Assert.assertTrue(jsonIncludeBlockFor(content, "optionalNonNullable").contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), + "optional non-nullable must be NON_NULL by default"); + Assert.assertFalse(jsonIncludeBlockFor(content, "optionalNullable").contains("@field:JsonInclude"), + "optional nullable must have no @JsonInclude annotation"); + } + + /** + * Issue #24401: {@code optionalNonNullPropertyJsonInclude=NONE} omits the annotation on optional + * non-nullable properties while keeping the required-field protection. + */ + @Test(description = "Issue #24401 – optionalNonNullPropertyJsonInclude=NONE (kotlin-spring)") + public void jsonInclude_optionalNonNullPolicy_none() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + Map.of(KotlinSpringServerCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); + + String content = Files.readString(files.get("TestModel.kt").toPath()); + Assert.assertFalse(jsonIncludeBlockFor(content, "optionalNonNullable").contains("@field:JsonInclude"), + "optional non-nullable must have no annotation when policy is NONE"); + Assert.assertTrue(jsonIncludeBlockFor(content, "requiredNonNullable").contains("@field:JsonInclude(JsonInclude.Include.ALWAYS)"), + "required-field protection must still be present"); + } + + /** + * Issue #24401: {@code generateJsonIncludeAnnotations=false} removes ALL policy @JsonInclude + * annotations, including required-field protection. + */ + @Test(description = "Issue #24401 – generateJsonIncludeAnnotations=false removes all policy annotations (kotlin-spring)") + public void jsonInclude_generateJsonIncludeAnnotations_false() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + + assertFileNotContains(files.get("TestModel.kt").toPath(), "@field:JsonInclude("); + } + + /** + * Issue #24401: a manual per-property {@code x-jackson-json-include-policy} vendor extension always + * overrides the automatic behavior, even when {@code generateJsonIncludeAnnotations=false}. + */ + @Test(description = "Issue #24401 – manual vendor-extension override wins (kotlin-spring)") + public void jsonInclude_manualOverride_winsOverGenerateFlag() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_override.yaml", + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + + String content = Files.readString(files.get("TestModel.kt").toPath()); + Assert.assertTrue(jsonIncludeBlockFor(content, "overridden").contains("@field:JsonInclude(JsonInclude.Include.NON_EMPTY)"), + "manual override must be honored even with generateJsonIncludeAnnotations=false"); + Assert.assertFalse(jsonIncludeBlockFor(content, "plain").contains("@field:JsonInclude"), + "non-overridden field must have no annotation when generateJsonIncludeAnnotations=false"); + } + + /** + * Returns the source region isolating a single property's annotations, bounded by the previous + * property's {@code @get:JsonProperty} marker, so @field:JsonInclude checks are property-specific. + */ + private static String jsonIncludeBlockFor(String content, String propName) { + int end = content.indexOf("@get:JsonProperty(\"" + propName + "\""); + Assert.assertTrue(end >= 0, propName + " property must exist"); + int prev = content.lastIndexOf("@get:JsonProperty(", end - 1); + return content.substring(Math.max(0, prev), end); + } + + /** + * Issue #24401: with one property per schema, each generated model must import exactly the Jackson + * annotations its single property needs. openApiNullable=true so optional nullable uses JsonNullable. + */ + @Test(description = "Issue #24401 – per-schema import isolation (kotlin-spring)") + public void jsonInclude_perSchemaImports() throws IOException { + final String jsonInclude = "import com.fasterxml.jackson.annotation.JsonInclude"; + final String jsonSetter = "import com.fasterxml.jackson.annotation.JsonSetter"; + final String nulls = "import com.fasterxml.jackson.annotation.Nulls"; + final String jsonNullable = "import org.openapitools.jackson.nullable.JsonNullable"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + + // required non-nullable -> @field:JsonInclude(ALWAYS); no setter/nullable machinery + Path requiredNonNullable = files.get("RequiredNonNullable.kt").toPath(); + assertFileContains(requiredNonNullable, jsonInclude); + assertFileNotContains(requiredNonNullable, jsonSetter, nulls, jsonNullable); + // required nullable -> @field:JsonInclude(ALWAYS) + Path requiredNullable = files.get("RequiredNullable.kt").toPath(); + assertFileContains(requiredNullable, jsonInclude); + assertFileNotContains(requiredNullable, jsonSetter, nulls, jsonNullable); + // optional non-nullable -> @field:JsonInclude(NON_NULL) + @field:JsonSetter(Nulls.FAIL) + Path optionalNonNullable = files.get("OptionalNonNullable.kt").toPath(); + assertFileContains(optionalNonNullable, jsonInclude, jsonSetter, nulls); + assertFileNotContains(optionalNonNullable, jsonNullable); + // optional nullable with openApiNullable=true -> JsonNullable, NO @field:JsonInclude + Path optionalNullable = files.get("OptionalNullable.kt").toPath(); + assertFileContains(optionalNullable, jsonNullable); + assertFileNotContains(optionalNullable, jsonInclude, jsonSetter, nulls); + } + + /** + * Issue #24401: even with {@code generateJsonIncludeAnnotations=false}, a manual per-property vendor + * extension must still emit its annotation AND the JsonInclude import must be present. + */ + @Test(description = "Issue #24401 – manual override emits import even when annotations disabled (kotlin-spring)") + public void jsonInclude_manualOverride_emitsImport_whenAnnotationsDisabled() throws IOException { + final String jsonInclude = "import com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + + Path manualOverride = files.get("ManualOverride.kt").toPath(); + assertFileContains(manualOverride, jsonInclude); + Assert.assertTrue(jsonIncludeBlockFor(Files.readString(manualOverride), "value") + .contains("@field:JsonInclude(JsonInclude.Include.NON_EMPTY)"), + "manual override must be emitted even when generateJsonIncludeAnnotations=false"); + // A schema without the override must not import JsonInclude when annotations are disabled + assertFileNotContains(files.get("OptionalNonNullable.kt").toPath(), jsonInclude); + } + + /** + * Issue #24401: a forced override on an optional+nullable ({@code JsonNullable}) property must be + * respected — the annotation is emitted and the JsonInclude import is added. + */ + @Test(description = "Issue #24401 – forced override on JsonNullable emits annotation and import (kotlin-spring)") + public void jsonInclude_forcedOverride_onJsonNullable_emitsAnnotationAndImport() throws IOException { + final String jsonInclude = "import com.fasterxml.jackson.annotation.JsonInclude"; + final String jsonNullable = "import org.openapitools.jackson.nullable.JsonNullable"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + + Path forced = files.get("ForcedOnJsonNullable.kt").toPath(); + assertFileContains(forced, jsonInclude, jsonNullable, "JsonNullable"); + Assert.assertTrue(jsonIncludeBlockFor(Files.readString(forced), "value") + .contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), + "forced override on JsonNullable field must be emitted"); } /** diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_override.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_override.yaml new file mode 100644 index 000000000000..c39028982365 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_override.yaml @@ -0,0 +1,30 @@ +openapi: 3.0.0 +info: + title: JsonInclude manual override test + version: 1.0.0 +paths: + /test: + post: + operationId: testPost + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/TestModel' + responses: + '200': + description: OK +components: + schemas: + TestModel: + type: object + properties: + # Manual per-property override via the universal vendor extension. + overridden: + type: string + nullable: false + x-jackson-json-include-policy: NON_EMPTY + # No override: with generateJsonIncludeAnnotations=false this must get no annotation. + plain: + type: string + nullable: false diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml new file mode 100644 index 000000000000..c09979cb96c6 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml @@ -0,0 +1,81 @@ +openapi: 3.0.0 +info: + title: JsonInclude per-schema import isolation test + version: 1.0.0 + description: > + Each schema holds exactly one property covering one required/optional x + nullable/non-nullable combination. Isolating a single case per model ensures the + generated imports (JsonInclude, JsonSetter, Nulls, JsonNullable) are correct for + every case on their own, without another property masking a missing import. +paths: + /test: + post: + operationId: testPost + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/RequiredNonNullable' + responses: + '200': + description: OK +components: + schemas: + # required + non-nullable + RequiredNonNullable: + type: object + required: + - value + properties: + value: + type: string + nullable: false + # required + nullable + RequiredNullable: + type: object + required: + - value + properties: + value: + type: string + nullable: true + # optional + non-nullable + OptionalNonNullable: + type: object + properties: + value: + type: string + nullable: false + # optional + non-nullable with a default value + OptionalNonNullableWithDefault: + type: object + properties: + value: + type: string + nullable: false + default: "defaultValue" + # optional + nullable + OptionalNullable: + type: object + properties: + value: + type: string + nullable: true + # manual per-property override: even with generateJsonIncludeAnnotations=false the + # annotation (and its import) must still be emitted from the vendor extension. + ManualOverride: + type: object + properties: + value: + type: string + nullable: false + x-jackson-json-include-policy: NON_EMPTY + # forced override on an optional + nullable (JsonNullable) property: the automatic path emits + # nothing here, but an explicit vendor extension must be respected and its import added. + ForcedOnJsonNullable: + type: object + properties: + value: + type: string + nullable: true + x-jackson-json-include-policy: NON_NULL From 6408e37698c48e204dc52ff8325a3e0bba23e1a9 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 13:52:00 +0200 Subject: [PATCH 02/20] update samples and documentation --- .../src/main/java/org/openapitools/model/Pet.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../model/AdditionalPropertiesClassDto.java | 1 - .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 + .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../org/openapitools/model/NullableMapPropertyDto.java | 2 -- .../org/openapitools/model/ParentWithNullableDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ++++++ .../org/openapitools/model/TypeHolderExampleDto.java | 7 +++++++ .../model/AdditionalPropertiesClassDto.java | 1 - .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 + .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../org/openapitools/model/NullableMapPropertyDto.java | 2 -- .../org/openapitools/model/ParentWithNullableDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ++++++ .../org/openapitools/model/TypeHolderExampleDto.java | 7 +++++++ .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../openapitools/model/ContainerDefaultValueDto.java | 3 +++ .../main/java/org/openapitools/model/EnumTestDto.java | 1 + .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ++++++ .../org/openapitools/model/TypeHolderExampleDto.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../model/AdditionalPropertiesClassDto.java | 1 - .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 + .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../org/openapitools/model/NullableMapPropertyDto.java | 2 -- .../org/openapitools/model/ParentWithNullableDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ++++++ .../org/openapitools/model/TypeHolderExampleDto.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Apple.java | 3 +++ .../src/main/java/org/openapitools/model/Banana.java | 3 +++ .../src/main/java/org/openapitools/model/Bar.java | 1 + .../src/main/java/org/openapitools/model/Entity.java | 1 + .../main/java/org/openapitools/model/EntityRef.java | 1 + .../main/java/org/openapitools/model/Extensible.java | 1 + .../src/main/java/org/openapitools/model/Fruit.java | 1 + .../src/main/java/org/openapitools/model/Apple.java | 3 +++ .../src/main/java/org/openapitools/model/Banana.java | 3 +++ .../src/main/java/org/openapitools/model/Bar.java | 1 + .../src/main/java/org/openapitools/model/Entity.java | 1 + .../main/java/org/openapitools/model/EntityRef.java | 1 + .../main/java/org/openapitools/model/Extensible.java | 1 + .../src/main/java/org/openapitools/model/Fruit.java | 1 + .../src/main/java/org/openapitools/model/Apple.java | 3 +++ .../src/main/java/org/openapitools/model/Banana.java | 3 +++ .../src/main/java/org/openapitools/model/Bar.java | 1 + .../src/main/java/org/openapitools/model/Entity.java | 1 + .../main/java/org/openapitools/model/EntityRef.java | 1 + .../main/java/org/openapitools/model/Extensible.java | 1 + .../src/main/java/org/openapitools/model/Fruit.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Foo.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Dog.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 1 + .../src/main/kotlin/org/openapitools/model/Bird.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Robobird.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Car.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Truck.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Vehicle.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../kotlin/org/openapitools/model/AnyOfUserOrPet.kt | 3 +++ .../openapitools/model/AnyOfUserOrPetOrArrayString.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Apa.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Dog.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/ApiError.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/PageMeta.kt | 5 +++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 1 + .../src/main/kotlin/org/openapitools/model/Category.kt | 1 + .../src/main/kotlin/org/openapitools/model/Dog.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../kotlin/org/openapitools/model/NullableModel.kt | 3 ++- .../src/main/kotlin/org/openapitools/model/Pet.kt | 1 + .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Dog.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../org/openapitools/model/ObjectWithUniqueItems.java | 2 -- .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 3 +++ .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../model/AdditionalPropertiesClassDto.java | 1 - .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 + .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../org/openapitools/model/NullableMapPropertyDto.java | 2 -- .../org/openapitools/model/ParentWithNullableDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ++++++ .../org/openapitools/model/TypeHolderExampleDto.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../src/main/java/org/openapitools/model/PageMeta.java | 5 +++++ .../src/main/java/org/openapitools/model/Pet.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../java/org/openapitools/model/NullableModel.java | 3 ++- .../src/main/java/org/openapitools/model/Pet.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../openapitools/model/AdditionalPropertiesClass.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 + .../src/main/java/org/openapitools/model/Category.java | 1 + .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 + .../main/java/org/openapitools/model/FormatTest.java | 4 ++++ .../src/main/java/org/openapitools/model/Name.java | 1 + .../org/openapitools/model/NullableMapProperty.java | 2 -- .../org/openapitools/model/ParentWithNullable.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 ++ .../java/org/openapitools/model/TypeHolderDefault.java | 6 ++++++ .../java/org/openapitools/model/TypeHolderExample.java | 7 +++++++ .../virtualan/model/AdditionalPropertiesClass.java | 1 - .../java/org/openapitools/virtualan/model/Animal.java | 1 + .../org/openapitools/virtualan/model/Category.java | 1 + .../virtualan/model/ContainerDefaultValue.java | 4 ++-- .../org/openapitools/virtualan/model/EnumTest.java | 1 + .../org/openapitools/virtualan/model/FormatTest.java | 4 ++++ .../java/org/openapitools/virtualan/model/Name.java | 1 + .../virtualan/model/NullableMapProperty.java | 2 -- .../virtualan/model/ParentWithNullable.java | 1 - .../java/org/openapitools/virtualan/model/Pet.java | 2 ++ .../virtualan/model/TypeHolderDefault.java | 6 ++++++ .../virtualan/model/TypeHolderExample.java | 7 +++++++ .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../main/java/org/openapitools/model/EnumTestDto.java | 2 +- .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../org/openapitools/model/HealthCheckResultDto.java | 2 -- .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../java/org/openapitools/model/NullableClassDto.java | 10 ---------- .../model/OuterObjectWithEnumPropertyDto.java | 2 ++ .../org/openapitools/model/ParentWithNullableDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../model/AdditionalPropertiesClassDto.java | 1 - .../main/java/org/openapitools/model/AnimalDto.java | 1 + .../main/java/org/openapitools/model/CategoryDto.java | 1 + .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 + .../java/org/openapitools/model/FormatTestDto.java | 4 ++++ .../src/main/java/org/openapitools/model/NameDto.java | 1 + .../org/openapitools/model/NullableMapPropertyDto.java | 2 -- .../org/openapitools/model/ParentWithNullableDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 ++ .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ++++++ .../org/openapitools/model/TypeHolderExampleDto.java | 7 +++++++ 426 files changed, 906 insertions(+), 150 deletions(-) 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 4aa4e0f36117..83c89d9c9800 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 @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType = "Pet"; @JsonInclude(JsonInclude.Include.NON_NULL) 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 0d9d99f20e09..53b64044c6e3 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable name = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private List photoUrls = new ArrayList<>(); 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 f655d26b20a7..141ad532407c 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 46a16d7fe21d..fb95071ae45f 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 @@ -58,7 +58,6 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c724049e493b..ccfe65d189e1 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 20129cb89013..44a1a1ea0b01 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 @@ -27,6 +27,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index ccb8f5a5647f..d88271c2bf46 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -29,14 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 9c39a7569a81..250a8a7fa9fb 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 @@ -103,6 +103,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 ac2ef6be7859..0db61103ab8a 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 @@ -39,6 +39,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -50,11 +51,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -65,6 +68,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e11dd113cbc2..9dcea8d6c27b 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 350b970a945d..f84d9d21f9cf 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 1d18853e2e2e..cb3f764522a6 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 2052979417f7..b4eda9e7f9c4 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 @@ -39,8 +39,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 99d18a336d78..a1c213eb40de 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +28,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index b0faf5aaa9ae..b0f401268821 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +28,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 b893bb4ec7c6..613b36dd183c 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 e301cd61dba3..67474f01ec05 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 5c51fa54cc0a..ca80887aed58 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 @@ -26,6 +26,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index af2b07f95d73..fe0be24e229d 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 5263a4e2bc96..5069a1a9acbb 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 @@ -102,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 18101da678fa..c68a2728bcb1 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 @@ -38,6 +38,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -49,11 +50,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -64,6 +67,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 0d4be7ac8140..b6b48d488ede 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 @@ -23,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index f93832a65c98..d9edf72050f1 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 2300afd143a4..af08c71fb48f 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 @@ -74,7 +74,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 0ce2b93a2b0f..791eea25f843 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 @@ -38,8 +38,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 987983e43451..8ca218f8c704 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 4db40f3db382..eea548352cc7 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 2bec6c231fc2..72a715bd0e20 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 @@ -36,8 +36,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 0cd4c4edbd58..d143dbf68f9c 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 @@ -56,7 +56,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 282ca2ce689b..fe52d0aa116a 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 6778a62dfd5e..a606369f1c61 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 @@ -25,6 +25,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 16f74d8223aa..ca932fee5f0f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,14 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 54c2c98f7fe4..58945182bd97 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 @@ -103,6 +103,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 c2dc9d17f0b8..fe3df02f9da4 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 @@ -39,6 +39,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -50,11 +51,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -65,6 +68,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 07be2f99663a..1edf0813d0b5 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 @@ -22,6 +22,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index 3abb813498f2..dff5aa4523f8 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 79e274840817..9b895427687b 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 @@ -74,7 +74,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 be762175a56b..2e84df56c536 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 @@ -37,8 +37,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 1f8e4dc3d890..7aedd82ea28e 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +26,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java index d37cdc713ec3..f1609752ba2f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +26,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 120027d72686..b266f37f4576 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 @@ -55,7 +55,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 f5d220bc1b43..29ecd6ae4724 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 @@ -35,6 +35,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 bcd733ba06d7..dd15acc4171f 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 @@ -24,6 +24,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a348b064c179..31a8133cb94f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,14 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c62cf18d0eee..07926663552d 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 @@ -102,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 c0831401197a..f4aea008dfa3 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 @@ -38,6 +38,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -49,11 +50,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -64,6 +67,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f237f6637dd5..5be398a7e1c9 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 @@ -21,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index d5fda5613396..5e0395f3fd34 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -26,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 40350659ae78..a2e4fd94701a 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 @@ -73,7 +73,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 89685de90050..906fa96ae1ee 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4bf6cba777df..e8978ec83178 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +25,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java index 5e77ca347711..4caccae69640 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 120027d72686..b266f37f4576 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 @@ -55,7 +55,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 f5d220bc1b43..29ecd6ae4724 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 @@ -35,6 +35,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 bcd733ba06d7..dd15acc4171f 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 @@ -24,6 +24,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a348b064c179..31a8133cb94f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,14 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c62cf18d0eee..07926663552d 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 @@ -102,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 c0831401197a..f4aea008dfa3 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 @@ -38,6 +38,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -49,11 +50,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -64,6 +67,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f237f6637dd5..5be398a7e1c9 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 @@ -21,6 +21,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index d5fda5613396..5e0395f3fd34 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -26,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 40350659ae78..a2e4fd94701a 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 @@ -73,7 +73,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 89685de90050..906fa96ae1ee 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4bf6cba777df..e8978ec83178 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +25,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 5e77ca347711..4caccae69640 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 79eb758c01f0..3e9eafcccd85 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 @@ -39,6 +39,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 a7974b8569f2..13fb12b7ecd2 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 @@ -29,6 +29,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index b28ffec6be94..b5627e929b6b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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 @@ public class ContainerDefaultValueDto { private @Nullable List nullableArray; + @JsonInclude(JsonInclude.Include.ALWAYS) private List nullableRequiredArray; + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private @Nullable List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); 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 f94de0c9c545..cf17977dfcac 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 @@ -105,6 +105,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e6c0613fa656..9b9fcb4d1bf8 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 @@ -41,6 +41,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,11 +53,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -67,6 +70,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 809f87f431c2..bc3e2c3c5da0 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 @@ -26,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 30524a3fe8d0..8e339b8f2701 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 @@ -41,8 +41,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index e92f8c79ef5f..c0325225555f 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +28,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 0400294f91bc..522e6a5f3520 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +28,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 5daca86cbb74..a3e051349288 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2e8e804a79d3..e4e0790b3e92 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 08c3a1d9091a..3455dcf8b80b 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 09216052292e..219aeb0cd0ed 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 bab57721b404..671101c3ca77 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 6c85cd100777..17566a89eeda 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 9b15554afbc6..aa4b273b332e 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 @@ -23,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java index d606c62a8fcf..c25a2eaa55bf 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d6a067cca4e5..fde0586fa40c 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 f4272d0f6c80..a879f5ebd770 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java index a3fc75dcc4f8..ac5a2fd1272b 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java index 4171f01f6aed..faf1e1ff30ef 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 b893bb4ec7c6..613b36dd183c 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 e301cd61dba3..67474f01ec05 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 5c51fa54cc0a..ca80887aed58 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 @@ -26,6 +26,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index af2b07f95d73..fe0be24e229d 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 5263a4e2bc96..5069a1a9acbb 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 @@ -102,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 18101da678fa..c68a2728bcb1 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 @@ -38,6 +38,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -49,11 +50,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -64,6 +67,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 0d4be7ac8140..b6b48d488ede 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 @@ -23,6 +23,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index f93832a65c98..d9edf72050f1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 2300afd143a4..af08c71fb48f 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 @@ -74,7 +74,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 0ce2b93a2b0f..791eea25f843 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 @@ -38,8 +38,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 987983e43451..8ca218f8c704 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 4db40f3db382..eea548352cc7 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 819444909ebb..590fef4efc14 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 @@ -34,8 +34,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional category = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 e7ed1e26b8fa..9308a4a8eed9 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 @@ -35,8 +35,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 4aa4e0f36117..83c89d9c9800 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 @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType = "Pet"; @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 d5f2df7bca2b..56776316e18b 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 212def45ba53..cf8d702378be 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 9fcdefe1da2e..5e934e643224 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 aeb76fdcd3b2..65e0ceefa324 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 526aa66a1882..3f9be180fd12 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 87c1af437ed4..ad228020783e 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 ab6a00effad0..2905cdf83cf0 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index 56da244f404e..8eb2ebe70171 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index 2796a8f8c4ec..7547cfb95047 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 f655d26b20a7..141ad532407c 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java index 3ea2af2720cd..0f2566549e46 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Apple implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java index 8b42e4bccec3..d6f893866d1e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Banana implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 93a0bdb89f2a..183cf2f6e604 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 @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Bar extends Entity implements BarRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private String id; @JsonInclude(JsonInclude.Include.NON_NULL) 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 c6bff315d94c..d3b3476145d6 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 @@ -52,6 +52,7 @@ public class Entity { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 c3e7425d99a4..fb39bfa8fd71 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 @@ -48,6 +48,7 @@ public class EntityRef { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; @JsonInclude(JsonInclude.Include.NON_NULL) 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 6b1a418efa4e..5426785a0d55 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 @@ -29,6 +29,7 @@ public class Extensible { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java index 3d77543df254..2233230221a9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java index f98df374ed7a..3cb15460b8cf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Apple implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java index b168fc3d764e..1796fc81d4be 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Banana implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 c27bcfa659c7..0a385721560a 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 @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Bar extends Entity implements BarRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private String id; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4a0620729d17..10167c1164ee 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 @@ -52,6 +52,7 @@ public sealed class Entity permits Bar, BarCreate, Foo, Pasta, Pizza { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 33e1b724576b..6d9b7196a1ee 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 @@ -48,6 +48,7 @@ public sealed class EntityRef permits BarRef, FooRef { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; @JsonInclude(JsonInclude.Include.NON_NULL) 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 b9e911f48fa7..bf5afd3ab33b 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 @@ -29,6 +29,7 @@ public final class Extensible { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java index 45b655f0ce22..a9901953bd7e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java index 0be64c62685f..cd02d6d6bdab 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Apple implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java index cb801806025f..cd3bb74e50bd 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Banana implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 acaa8e50aa91..9854268cedbe 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 @@ -29,6 +29,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Bar extends Entity implements BarRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) private String id; @JsonInclude(JsonInclude.Include.NON_NULL) 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 3614b2ed6844..0068e39ff4cc 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 @@ -52,6 +52,7 @@ public class Entity { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 28083ecc80a2..782967688b0e 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 @@ -48,6 +48,7 @@ public class EntityRef { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; @JsonInclude(JsonInclude.Include.NON_NULL) 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 1ea149bee2a5..ee4781a36c64 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 @@ -29,6 +29,7 @@ public class Extensible { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java index 3d77543df254..2233230221a9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.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-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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 34fefa217937..0ff80dbce269 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 @@ -44,8 +44,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 76e94c5b80a7..8b46bc621498 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 @@ -43,8 +43,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 38e257be4546..127fd2f64399 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 @@ -50,6 +50,7 @@ public class Foo { @JsonInclude(JsonInclude.Include.NON_NULL) private List listMinIntems = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime requiredDt; 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 ce7523e6fee7..93a856e10555 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 @@ -45,8 +45,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 aa7e8049ad41..47e43e89eb8a 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 @@ -34,8 +34,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt index d5af2e05d658..4887b45e853b 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/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.JsonValue import com.fasterxml.jackson.annotation.JsonIgnoreProperties @@ -24,6 +25,7 @@ import jakarta.validation.Valid */ data class Cat( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("huntingSkill") @get:JsonProperty("huntingSkill", required = true) val huntingSkill: Cat.HuntingSkill, diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt index de31e3c6a74b..599607754f1d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/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.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties @@ -25,10 +26,12 @@ import jakarta.validation.Valid data class Dog( @field:Valid + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String = "dog", @get:Min(value=0) + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("packSize") @get:JsonProperty("packSize", required = true) val packSize: kotlin.Int = 0 ) : Pet { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt index 40869b85e6bb..373c49ea1ab7 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/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.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo 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 c5611ef934c7..cf8ed4566029 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 @@ -27,9 +27,11 @@ import jakarta.validation.Valid */ data class Bird( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "BIRD", + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_BIRD", 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 e11c5a0a1af1..374a42c3886d 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 @@ -27,9 +27,11 @@ import jakarta.validation.Valid */ data class Robobird( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "ROBOBIRD", + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_ROBOBIRD", diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt index f4e25930868d..831595203de0 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.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.JsonValue import org.openapitools.model.VehicleType @@ -26,9 +27,11 @@ import jakarta.validation.Valid data class Car( @field:Valid + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.CAR, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("numDoors") @get:JsonProperty("numDoors", required = true) val numDoors: kotlin.Int ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt index 61b3bda8c499..723e2f2376e8 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.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.JsonValue import org.openapitools.model.VehicleType @@ -26,9 +27,11 @@ import jakarta.validation.Valid data class Truck( @field:Valid + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.TRUCK, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("payloadCapacity") @get:JsonProperty("payloadCapacity", required = true) val payloadCapacity: java.math.BigDecimal ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt index 637caa41c0e0..afd7fad1a33d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.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.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo 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 978290446045..d37fcde397d1 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 @@ -30,9 +30,11 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 ebd784c67532..818ca34ee824 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 ebd784c67532..818ca34ee824 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 ebd784c67532..818ca34ee824 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 ebd784c67532..818ca34ee824 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 ebd784c67532..818ca34ee824 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 b0c7a8a472e2..28f9f7e2cf42 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 @@ -41,14 +41,17 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPet( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 245556f67207..7e5d66de499d 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 @@ -41,14 +41,17 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPetOrArrayString( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 edcf36d7df67..ab6822d9644c 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 67857d6d788d..e16108c6b858 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 @@ -32,6 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, 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 0de23f8edb3c..4734ca04df3e 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 @@ -33,9 +33,11 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 56c523367969..7cf3de7d9c48 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 @@ -30,9 +30,11 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 56c523367969..7cf3de7d9c48 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 @@ -30,9 +30,11 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 56c523367969..7cf3de7d9c48 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 @@ -30,9 +30,11 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 c076750eb99a..f6f096f6eed4 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 @@ -30,9 +30,11 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 70d1f73e208f..9ec6249ca10e 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 @@ -28,10 +28,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Apa( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bepa") @get:JsonProperty("bepa", required = true) val bepa: java.math.BigDecimal = java.math.BigDecimal("0"), @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("cepa") @get:JsonProperty("cepa", required = true) val cepa: java.math.BigDecimal = java.math.BigDecimal("6.28318"), 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 0aa99a764a76..7cd760e87cc8 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 45c87638f15f..0a072512fd08 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 4db812f3390c..0869716cacdd 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 @@ -37,14 +37,17 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 301b4c80b12f..9cd0d8edc3f8 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 @@ -38,26 +38,32 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) val breed: Dog.Breed, @ApiModelProperty(required = true, value = "Whether the dog enjoys fetching") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 c7effc69943c..eb40a7638b18 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 @@ -26,6 +26,7 @@ import jakarta.validation.Valid */ data class ApiError( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("errorCode") @get:JsonProperty("errorCode", required = true) val errorCode: ApiError.ErrorCode, 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 3f3a4d005b5b..5be374053e68 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) var name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) var photoUrls: kotlin.collections.MutableList, 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 d5959182a70f..572741c45089 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 @@ -30,9 +30,11 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 d5959182a70f..572741c45089 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 @@ -30,9 +30,11 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt index d2938312720f..a40d0746abed 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.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 jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -21,15 +22,19 @@ import jakarta.validation.Valid */ data class PageMeta( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("size") @get:JsonProperty("size", required = true) val propertySize: kotlin.Long, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("number") @get:JsonProperty("number", required = true) val number: kotlin.Long, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("totalElements") @get:JsonProperty("totalElements", required = true) val totalElements: kotlin.Long, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("totalPages") @get:JsonProperty("totalPages", required = true) val totalPages: kotlin.Long ) : 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 983d1f583f52..1fef46231b24 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 @@ -23,6 +23,7 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, 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 45c87638f15f..0a072512fd08 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 45c87638f15f..0a072512fd08 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 148d5e215f21..3ded71b1e461 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 @@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema data class Cat( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, 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 0349895b01be..48a8f76d11bf 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 @@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String = "default-name", 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 856de1f1a7b0..f6565a59f920 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 @@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema data class Dog( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, 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 3933754b80f8..664fcc2f0214 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.Set, 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 9ed84667a2bd..808f5695c0c8 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 @@ -25,9 +25,11 @@ import jakarta.validation.Valid */ data class NullableModel( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("requiredNonNullable") @get:JsonProperty("requiredNonNullable", required = true) val requiredNonNullable: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("requiredNullable") @get:JsonProperty("requiredNullable", required = true) val requiredNullable: kotlin.String?, @@ -36,7 +38,6 @@ data class NullableModel( @param:JsonProperty("optionalNonNullable") @get:JsonProperty("optionalNonNullable") val optionalNonNullable: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_ABSENT) @param:JsonProperty("optionalNullable") @get:JsonProperty("optionalNullable") val optionalNullable: JsonNullable = JsonNullable.undefined() ) : java.io.Serializable { 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 11b4702d5b38..3adf7cb3f88b 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 @@ -23,6 +23,7 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, 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 3de771e29973..121502d59510 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 @@ -32,10 +32,12 @@ import io.swagger.annotations.ApiModelProperty data class Pet( @ApiModelProperty(example = "doggie", required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 2f4708fe0104..298428490fdf 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 @@ -32,10 +32,12 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 4db812f3390c..0869716cacdd 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 @@ -37,14 +37,17 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 2202f4aae40b..911756347da6 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 @@ -38,26 +38,32 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) override val bark: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) override val breed: Dog.Breed, @ApiModelProperty(required = true, value = "Whether the dog enjoys fetching") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 a94d6438c2b5..c98aeda868da 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 @@ -31,9 +31,11 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 30bc93ff4da5..430f680158d4 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 @@ -33,13 +33,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ObjectWithUniqueItems { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullSet = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) private Set notNullSet = new LinkedHashSet<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullList = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 0364cbeb451f..d5fdd45f18f4 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 @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 0920e9972f19..cca98c14da84 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 @@ -27,6 +27,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 518f33493840..6674c88a2e4f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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,8 +27,10 @@ public class ContainerDefaultValue { private @Nullable List nullableArray; + @JsonInclude(JsonInclude.Include.ALWAYS) private List nullableRequiredArray; + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private @Nullable List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); 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 c5b52e5f1168..171acfa4ae03 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 @@ -105,6 +105,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 12be011e4b50..e48c14544a78 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 @@ -41,6 +41,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,11 +53,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -67,6 +70,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e9a7f9cc9d8a..78dc53df6d91 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 @@ -25,6 +25,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 6a20ec90e83f..26e826f8fbc9 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 @@ -39,8 +39,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index e1ddc677876c..df8b8fbcdb51 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +26,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index 088b142a7513..3b3204e03b16 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +26,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 86be6e693c91..32023ee3da1e 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 f5dda830a79d..6ce4f7f8914c 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 48bdaa9344f8..11e1022ae3d3 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 30539406b232..b6557ceff4e9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 ef143d4788e3..8d3ed031d65d 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 c81f93c993ea..150781082c6d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 bd408cc22a7c..76e74fd67579 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 897b2fe03dd2..e2ceeea637fe 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty() { 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 6f7cb3fcb82c..50c34a0c9121 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable() { 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 4a92bd5c7782..ea586df2067a 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 157504edc6d6..d3800560158c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 405f1100a495..03b53c193ee8 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 c4d654ac44a6..bdce7e27156f 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 @@ -34,8 +34,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 3a1809dfa191..3f6cf5af234f 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 99e7a4cdca08..dac8f14035fc 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 75246c9ff8ce..d15dbbf7d60c 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 0e937a87f12b..1e996c854efe 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c8c06116f9a1..795d53cd01a6 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e99a9a785740..79dc8a7432ae 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 3a21421bf13c..4fd62bd3f389 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 14cce68e1223..56d45c3ad292 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 2b706856fd92..af16949486cc 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 cf4719096fb0..1b1399efc065 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7cc05e11b994..57fabf941047 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index a2f08996fefa..ab33d9a13ef8 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 37d3f00f767f..9ea7f74985a9 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 @@ -59,7 +59,6 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 234aef7fb345..fe05be4b1c68 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 @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 b54dbbd66b7f..e62f4eb17757 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 @@ -28,6 +28,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index fe421ec5cd1d..2bc02f7a7cc3 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -30,14 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 7bd7ee977200..4d3330046620 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 5894378400d2..e4f7ebda46b3 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 @@ -40,6 +40,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 6561257a70c2..6055fd7ceb2d 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 @@ -26,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index e82c4b3a1679..98ba228cdc9b 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 b4a5e5095239..982f8d038258 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 @@ -76,7 +76,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 a760602c8d73..84bb38e9fc00 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 @@ -40,8 +40,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index f59eb21da480..4fba162597a9 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +29,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 4b7506f903ec..fb1d40011dac 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +29,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 abb9aa57acef..d4c997738f18 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 @@ -52,6 +52,7 @@ public class Pet { @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("name") + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @@ -59,6 +60,7 @@ public class Pet { @JsonProperty("photoUrls") @lombok.Builder.Default + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); 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 3819f2efd3fb..1a5e177b89a4 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 @@ -41,8 +41,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java index 6c356b8a5b13..a1a34c2041d5 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,12 +25,16 @@ public class PageMeta implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long size; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long number; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long totalElements; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long totalPages; public PageMeta() { 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 477568049136..5bbe5fb75ae0 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 @@ -28,6 +28,7 @@ public class Pet implements Serializable { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 37d29c32b8da..c16ac8affc4e 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 @@ -36,8 +36,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4798bc0c028d..fc4f770ac1d9 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 2f923496661e..7812e1c12382 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 b4d90992ea4c..0cb8e0d45c2d 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d095e6659db9..d394b3e38431 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..728f7cad250d 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 cad9a99b10f5..e6fa1ccea8b4 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 @@ -28,14 +28,15 @@ public class NullableModel implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private String requiredNonNullable; + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable requiredNullable = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String optionalNonNullable; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable optionalNullable = JsonNullable.undefined(); public NullableModel() { 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 81f0dd9c6551..5ec773c75180 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 @@ -28,6 +28,7 @@ public class Pet implements Serializable { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4e0c294dd76c..bceaaab0ee8e 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 cb174a615f9b..e24c2373ad81 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e58434a4f202..63a0767c6aba 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 @@ -35,8 +35,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4e0c294dd76c..bceaaab0ee8e 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 cb174a615f9b..e24c2373ad81 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e58434a4f202..63a0767c6aba 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 @@ -35,8 +35,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4e0c294dd76c..bceaaab0ee8e 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 cb174a615f9b..e24c2373ad81 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e58434a4f202..63a0767c6aba 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 @@ -35,8 +35,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 4e0c294dd76c..bceaaab0ee8e 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 @@ -36,6 +36,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 f6a38799c911..03999441f921 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 cef26523d335..5bd8c11d9722 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 cb174a615f9b..e24c2373ad81 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 2fc98b6fb666..4b44b936d3e2 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e58434a4f202..63a0767c6aba 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 @@ -35,8 +35,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 e58434a4f202..63a0767c6aba 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 @@ -35,8 +35,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 1b93d77f015d..00053ec24f51 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional anytype1 = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 1f7e2da6b646..b4710c3479a4 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 76970a34483f..7b32f50b3b7b 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index ac5c31975e54..08ffd48ec9d6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 4d882356686c..161dc129156c 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0584bf0b3730..83c03f906fc6 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional int64 = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@Pattern(regexp = "[a-zA-Z]") String> string = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private Optional binary = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional uuid = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 390ab0989b32..773544c5edf4 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java index 9856b0d77cd6..ab4c11a99f4f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 22db1d786cd5..e5e63411d868 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional type = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(TypeEnum type) { 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 8d3f1d0cf422..ceab4bd69ef0 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional category = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 2a1d1c058908..2bab3abf7d07 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 315db140f253..65193abb520e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a38602c22da4..51f8239e6287 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 @@ -57,7 +57,6 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 b200b3f62188..9f6a83b4973f 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 1114456a68a1..e4a77578766d 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 @@ -26,6 +26,7 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index e969b98a302b..2bd4f51c4140 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 7b02c6226925..65374acc591d 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 @@ -104,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 d1274d6cf08f..92a22136e7a7 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 @@ -40,6 +40,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 5e8a32edb738..736006c8b6f5 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 @@ -24,6 +24,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java index 7db52928c1c6..fc013fe70f4c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d092b2fc47d5..bb28729decdd 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 @@ -75,7 +75,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 68c3ebd77107..6c54f41ddd69 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 @@ -38,8 +38,10 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index b4242f545bc2..b6e5a480c71e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index c6167ecb0cd8..cba300e3a67e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 eacc2158fcdd..db9084f361ed 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 @@ -37,6 +37,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto implements com.custompackage.InterfaceToKeep, com.custompackage.WithColor { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 b54dbbd66b7f..e62f4eb17757 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 @@ -28,6 +28,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 e64c0995389d..1576c5046e33 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 @@ -110,6 +110,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -188,7 +189,6 @@ public static EnumNumberEnum fromValue(Double value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable outerEnum = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 9baeea9cc239..b2bcf9fec2d6 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 @@ -40,6 +40,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -54,11 +55,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,6 +72,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java index 2b3de797a45a..ac09a0a9834b 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class HealthCheckResultDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableMessage = JsonNullable.undefined(); public HealthCheckResultDto nullableMessage(String nullableMessage) { 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 6561257a70c2..6055fd7ceb2d 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 @@ -26,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 99e4c9ecbf90..55fe5702be7f 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 @@ -40,39 +40,29 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableClassDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable integerProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable numberProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable booleanProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable stringProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private JsonNullable dateProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private JsonNullable datetimeProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> arrayNullableProp = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItemsNullable = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> objectNullableProp = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java index 2bc2073abb6a..ab45923a4570 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class OuterObjectWithEnumPropertyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private OuterEnumIntegerDto value; public OuterObjectWithEnumPropertyDto() { 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 b4a5e5095239..982f8d038258 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 @@ -76,7 +76,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 77a5d6571d54..5cbf751e6bd4 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 @@ -40,8 +40,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 d04080bd138a..3115be7ad0b3 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 @@ -59,7 +59,6 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 9954743744b8..0ea4d126864a 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 @@ -38,6 +38,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e9a8e17231e4..34487fc4bbc4 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 @@ -28,6 +28,7 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 935dbf3e6f4d..39f4e40b9ba0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -30,14 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 5ab270f93a2e..bf188bb1b01d 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 @@ -105,6 +105,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 13b1eb4fcd2e..4f54909c543d 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 @@ -40,6 +40,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,11 +52,13 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -66,6 +69,7 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 585d573dfecf..a4fdb5f297fd 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 @@ -26,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index e712397bff32..50958c247610 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 2162ebf85db4..af2b3803d750 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 @@ -77,7 +77,6 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 3953250b4693..bbeb1cf7c867 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 @@ -41,8 +41,10 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index d9d8b4f78585..0ef0624afb20 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +29,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index aa7879602dc5..fbf86a0db3f3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +29,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { From ed876b9395fffa557c208d1053999ee1a31a048a Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 13:52:17 +0200 Subject: [PATCH 03/20] update documentation --- docs/generators/java-camel.md | 2 ++ docs/generators/kotlin-spring.md | 2 ++ docs/generators/spring.md | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 2e2d5191f02f..97c2304f5b83 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -64,6 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBuilders|Whether to generate builders for models| |false| |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false| |generateGenericResponseEntity|Use a generic type for the `ResponseEntity` wrapping return values of generated API methods. If enabled, method are generated with return type ResponseEntity<?>| |false| +|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When false, all automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) are omitted so the global ObjectMapper owns inclusion. A per-property override set via the `x-jackson-json-include-policy` vendor extension is still honored.| |true| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| @@ -83,6 +84,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelPackage|package for generated models| |org.openapitools.model| |openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true| |optionalAcceptNullable|Use `ofNullable` instead of just `of` to accept null values when using Optional.| |true| +|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index f42388d53000..54d80c1ea7b1 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -33,6 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**source**
Publish the original input OpenAPI specification.
**springdoc**
Generate an OpenAPI 3 specification using SpringDoc.
|springdoc| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original| |exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true| +|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When false, all automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) are omitted so the global ObjectMapper owns inclusion. A per-property override set via the `x-jackson-json-include-policy` vendor extension is still honored.| |true| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |gradleBuildFile|generate a gradle build file using the Kotlin DSL| |true| @@ -44,6 +45,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelMutable|Create mutable models| |false| |modelPackage|model package for generated code| |org.openapitools.model| |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| +|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |packageName|Generated artifact package name.| |org.openapitools| |parcelizeModels|toggle "@Parcelize" for generated models| |null| |reactive|use coroutines for reactive behavior| |false| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 31f5f55ff4a5..194a1c7a1b40 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -57,6 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBuilders|Whether to generate builders for models| |false| |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false| |generateGenericResponseEntity|Use a generic type for the `ResponseEntity` wrapping return values of generated API methods. If enabled, method are generated with return type ResponseEntity<?>| |false| +|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When false, all automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) are omitted so the global ObjectMapper owns inclusion. A per-property override set via the `x-jackson-json-include-policy` vendor extension is still honored.| |true| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| @@ -76,6 +77,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelPackage|package for generated models| |org.openapitools.model| |openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true| |optionalAcceptNullable|Use `ofNullable` instead of just `of` to accept null values when using Optional.| |true| +|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| From 3dc68ed9fde92ce0665dd37994a2a664ba77171c Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 15:31:28 +0200 Subject: [PATCH 04/20] feat(json-include): add support for configurable @JsonSetter(nulls) annotations on optional non-nullable properties --- .../languages/KotlinSpringServerCodegen.java | 63 ++++++++++++++----- .../codegen/languages/SpringCodegen.java | 51 ++++++++++++--- .../java/spring/SpringCodegenTest.java | 56 +++++++++++++++-- .../spring/KotlinSpringServerCodegenTest.java | 36 +++++++++-- 4 files changed, 168 insertions(+), 38 deletions(-) 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 08555c967cd9..27f7d287ade5 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 @@ -113,6 +113,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String SUSPEND_FUNCTIONS = "suspendFunctions"; public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; + public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = "generateJsonSetterNullsAnnotations"; /** * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. @@ -192,7 +193,9 @@ public String getDescription() { private String valuedEnumClassName = "ValuedEnum"; @Setter private boolean suspendFunctions = false; @Getter @Setter private String optionalNonNullPropertyJsonInclude = "NON_NULL"; - @Getter @Setter private boolean generateJsonIncludeAnnotations = true; + // Tri-state: null = unset (weak default + warning), Boolean.FALSE = weak (muted), Boolean.TRUE = strict emission. + @Getter @Setter private Boolean generateJsonIncludeAnnotations = null; + @Getter @Setter private Boolean generateJsonSetterNullsAnnotations = null; @Getter @Setter private boolean openApiNullable = false; @Getter @Setter protected boolean useDeductionForOneOfInterfaces = false; @@ -326,7 +329,8 @@ public KotlinSpringServerCodegen() { addSwitch(SUSPEND_FUNCTIONS, "Whether to generate suspend functions for API operations. Useful for Spring MVC with Kotlin coroutines without requiring the full reactive stack.", suspendFunctions); CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, - "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. " + "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " + + GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); @@ -336,10 +340,18 @@ public KotlinSpringServerCodegen() { cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); addSwitch(GENERATE_JSON_INCLUDE_ANNOTATIONS, - "Whether to generate policy @JsonInclude annotations on model properties. When false, all " - + "automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) " - + "are omitted so the global ObjectMapper owns inclusion. A per-property override set via the " - + "`x-jackson-json-include-policy` vendor extension is still honored.", generateJsonIncludeAnnotations); + "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " + + "spec-honest annotations (required-field protection and the optional non-nullable policy from " + + OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " + + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " + + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.", false); + addSwitch(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + + "When true, emits @JsonSetter (Nulls.FAIL when openApiNullable is true, otherwise Nulls.SKIP) so " + + "an explicit null in the payload is handled explicitly. When false, none are generated and " + + "deserialization null-handling defers to the global ObjectMapper. When left unset it defaults to " + + "false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning.", false); 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, @@ -762,12 +774,33 @@ public void processOpts() { if (additionalProperties.containsKey(GENERATE_JSON_INCLUDE_ANNOTATIONS)) { this.setGenerateJsonIncludeAnnotations(convertPropertyToBoolean(GENERATE_JSON_INCLUDE_ANNOTATIONS)); } - writePropertyBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, generateJsonIncludeAnnotations); + writePropertyBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, Boolean.TRUE.equals(generateJsonIncludeAnnotations)); + if (additionalProperties.containsKey(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)) { + this.setGenerateJsonSetterNullsAnnotations(convertPropertyToBoolean(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)); + } + writePropertyBack(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, Boolean.TRUE.equals(generateJsonSetterNullsAnnotations)); if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); } this.optionalNonNullPropertyJsonInclude = normalizeJsonIncludePolicy(this.optionalNonNullPropertyJsonInclude); writePropertyBack(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); + if (generateJsonIncludeAnnotations == null) { + LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " + + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " + + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " + + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " + + "@JsonInclude, so leaving this unset preserves that behavior.", + GENERATE_JSON_INCLUDE_ANNOTATIONS, GENERATE_JSON_INCLUDE_ANNOTATIONS, + GENERATE_JSON_INCLUDE_ANNOTATIONS, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + } + if (generateJsonSetterNullsAnnotations == null) { + LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " + + "@JsonSetter(nulls = ...) on optional non-nullable fields.", + GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); + } if (additionalProperties.containsKey(BEAN_QUALIFIERS) && library.equals(SPRING_BOOT)) { this.setBeanQualifiers(convertPropertyToBoolean(BEAN_QUALIFIERS)); @@ -1316,15 +1349,11 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert property.example = null; } - // 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. - // Scenario 3: optional + non-nullable → always emit @JsonSetter to handle explicit JSON nulls. + // Scenario 3: optional + non-nullable → emit @JsonSetter to handle explicit JSON nulls, only when + // generateJsonSetterNullsAnnotations is explicitly enabled. // When openApiNullable=true: Nulls.FAIL → reject explicit null (strict PATCH semantics). // When openApiNullable=false: Nulls.SKIP → silently ignore explicit null (lenient, protects defaults). - if (!property.required && !property.isNullable) { + if (Boolean.TRUE.equals(generateJsonSetterNullsAnnotations) && !property.required && !property.isNullable) { if (openApiNullable) { property.vendorExtensions.put("x-has-json-setter-nulls-fail", true); } else { @@ -1385,7 +1414,7 @@ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty proper } return; } - if (!generateJsonIncludeAnnotations) { + if (!Boolean.TRUE.equals(generateJsonIncludeAnnotations)) { return; } String policy = null; @@ -1565,9 +1594,9 @@ public ModelsMap postProcessModelsEnum(ModelsMap objs) { for (ModelMap mo : objs.getModels()) { CodegenModel cm = mo.getModel(); for (CodegenProperty var : cm.optionalVars) { - // Scenario 3: optional + non-nullable → always emit @JsonSetter and @JsonInclude(NON_NULL). + // Scenario 3: optional + non-nullable → emit @JsonSetter when generateJsonSetterNullsAnnotations is enabled. // openApiNullable=true: Nulls.FAIL (strict). openApiNullable=false: Nulls.SKIP (lenient). - if (!var.required && !var.isNullable) { + if (Boolean.TRUE.equals(generateJsonSetterNullsAnnotations) && !var.required && !var.isNullable) { if (openApiNullable) { var.vendorExtensions.put("x-has-json-setter-nulls-fail", true); } else { 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 9c401db07d4a..0e766dbeb71d 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 @@ -125,6 +125,7 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String CLIENT_REGISTRATION_ID = "clientRegistrationId"; public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; + public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = "generateJsonSetterNullsAnnotations"; /** * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. @@ -170,7 +171,9 @@ public enum RequestMappingMode { protected boolean useOptional = false; @Setter protected boolean useSealed = false; @Getter @Setter protected String optionalNonNullPropertyJsonInclude = "NON_NULL"; - @Getter @Setter protected boolean generateJsonIncludeAnnotations = true; + // Tri-state: null = unset (weak default + warning), Boolean.FALSE = weak (muted), Boolean.TRUE = strict emission. + @Getter @Setter protected Boolean generateJsonIncludeAnnotations = null; + @Getter @Setter protected Boolean generateJsonSetterNullsAnnotations = null; @Setter protected boolean virtualService = false; @Setter protected boolean hateoas = false; @Setter protected boolean returnSuccessCode = false; @@ -296,7 +299,8 @@ public SpringCodegen() { "Whether to generate sealed model interfaces and classes")); CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, - "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. " + "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " + + GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); @@ -306,10 +310,18 @@ public SpringCodegen() { cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); cliOptions.add(CliOption.newBoolean(GENERATE_JSON_INCLUDE_ANNOTATIONS, - "Whether to generate policy @JsonInclude annotations on model properties. When false, all " - + "automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) " - + "are omitted so the global ObjectMapper owns inclusion. A per-property override set via the " - + "`x-jackson-json-include-policy` vendor extension is still honored.", generateJsonIncludeAnnotations)); + "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " + + "spec-honest annotations (required-field protection and the optional non-nullable policy from " + + OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " + + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " + + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.", false)); + cliOptions.add(CliOption.newBoolean(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + + "When true, emits @JsonSetter so an explicit null in the payload does not overwrite the field. " + + "When false, none are generated and deserialization null-handling defers to the global ObjectMapper. " + + "When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it " + + "explicitly to silence the warning.", false)); cliOptions.add(CliOption.newBoolean(API_FIRST, "Generate the API from the OAI spec at server compile time (API first approach)", apiFirst)); cliOptions @@ -585,11 +597,31 @@ public void processOpts() { convertPropertyToBooleanAndWriteBack(USE_SWAGGER_UI, this::setUseSwaggerUI); convertPropertyToBooleanAndWriteBack(USE_SEALED, this::setUseSealed); convertPropertyToBooleanAndWriteBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, this::setGenerateJsonIncludeAnnotations); + convertPropertyToBooleanAndWriteBack(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, this::setGenerateJsonSetterNullsAnnotations); if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); } this.optionalNonNullPropertyJsonInclude = normalizeJsonIncludePolicy(this.optionalNonNullPropertyJsonInclude); additionalProperties.put(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); + if (jackson) { + if (generateJsonIncludeAnnotations == null) { + LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " + + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " + + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " + + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " + + "@JsonInclude, so leaving this unset preserves that behavior.", + GENERATE_JSON_INCLUDE_ANNOTATIONS, GENERATE_JSON_INCLUDE_ANNOTATIONS, + GENERATE_JSON_INCLUDE_ANNOTATIONS, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + } + if (generateJsonSetterNullsAnnotations == null) { + LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " + + "@JsonSetter(nulls = ...) on optional non-nullable fields.", + GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); + } + } if (DocumentationProvider.NONE.equals(getDocumentationProvider())) { this.setUseSwaggerUI(false); } @@ -1246,8 +1278,9 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } // Optional + non-nullable, when openApiNullable=false: add @JsonSetter(nulls = Nulls.SKIP) on the - // setter so an explicit null in the payload does not overwrite the field's default. - if (!property.required && !property.isNullable && !openApiNullable) { + // setter so an explicit null in the payload does not overwrite the field's default. Only emitted when + // generateJsonSetterNullsAnnotations is explicitly enabled; otherwise deserialization defers to the mapper. + if (Boolean.TRUE.equals(generateJsonSetterNullsAnnotations) && !property.required && !property.isNullable && !openApiNullable) { property.vendorExtensions.put("x-has-json-setter-nulls-skip", true); model.imports.add("JsonSetter"); model.imports.add("Nulls"); @@ -1265,7 +1298,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert if (isJsonIncludePolicyEmitted(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION))) { model.imports.add("JsonInclude"); } - } else if (generateJsonIncludeAnnotations) { + } else if (Boolean.TRUE.equals(generateJsonIncludeAnnotations)) { String policy = null; if (property.required) { policy = property.isNullable ? "ALWAYS" : "NON_NULL"; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index a3f5e136f066..7b1e63c40247 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -8312,8 +8312,25 @@ void optionalNullableField_withOpenApiNullable_hasNoJsonIncludeAnnotation() thro } /** - * Issue #24401: default matrix for JAVA-SPRING (openApiNullable=true). - * required non-nullable -> NON_NULL, required nullable -> ALWAYS, + * Issue #24401 (safe-but-noisy): with no flags set, the generator defaults to weak/7.23.0 behavior — + * NO policy {@code @JsonInclude} or {@code @JsonSetter(nulls)} annotations are emitted, deferring + * entirely to the global ObjectMapper. + */ + @Test + void jsonInclude_unset_emitsNoPolicyAnnotations() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + + Path modelFile = files.get("TestModel.java").toPath(); + assertFileNotContains(modelFile, "@JsonInclude("); + assertFileNotContains(modelFile, "@JsonSetter("); + } + + /** + * Issue #24401: default matrix for JAVA-SPRING when {@code generateJsonIncludeAnnotations=true} + * (openApiNullable=true). required non-nullable -> NON_NULL, required nullable -> ALWAYS, * optional non-nullable -> NON_NULL (default policy), optional nullable -> no annotation. */ @Test @@ -8321,7 +8338,8 @@ void jsonInclude_defaultMatrix() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, - Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); JavaFileAssert.assertThat(files.get("TestModel.java")) .assertProperty("requiredNonNullable").assertPropertyAnnotations() @@ -8334,9 +8352,30 @@ void jsonInclude_defaultMatrix() throws IOException { .doesNotContainWithName("JsonInclude"); } + /** + * Issue #24401 (safe-but-noisy): {@code generateJsonSetterNullsAnnotations=true} emits + * {@code @JsonSetter(nulls = Nulls.SKIP)} on optional non-nullable fields (openApiNullable=false); + * leaving it unset emits none. + */ + @Test + void jsonSetterNulls_generateFlag_controlsEmission() throws IOException { + Map withFlag = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "false", + SpringCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + assertFileContains(withFlag.get("OptionalNonNullable.java").toPath(), "@JsonSetter(nulls = Nulls.SKIP)"); + + Map unset = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(CodegenConstants.OPENAPI_NULLABLE, "false")); + assertFileNotContains(unset.get("OptionalNonNullable.java").toPath(), "@JsonSetter("); + } + /** * Issue #24401: {@code optionalNonNullPropertyJsonInclude} changes the policy emitted for - * optional non-nullable properties. + * optional non-nullable properties (when {@code generateJsonIncludeAnnotations=true}). */ @Test void jsonInclude_optionalNonNullPolicy_nonEmpty() throws IOException { @@ -8344,6 +8383,7 @@ void jsonInclude_optionalNonNullPolicy_nonEmpty() throws IOException { "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", SpringCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NON_EMPTY")); JavaFileAssert.assertThat(files.get("TestModel.java")) @@ -8364,6 +8404,7 @@ void jsonInclude_optionalNonNullPolicy_none() throws IOException { "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", SpringCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); JavaFileAssert.assertThat(files.get("TestModel.java")) @@ -8422,7 +8463,8 @@ void jsonInclude_perSchemaImports() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, - Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); // required non-nullable -> @JsonInclude(NON_NULL); no setter machinery JavaFileAssert.assertThat(files.get("RequiredNonNullable.java")) @@ -8452,7 +8494,9 @@ void jsonInclude_perSchemaImports_withoutOpenApiNullable() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, - Map.of(CodegenConstants.OPENAPI_NULLABLE, "false")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "false", + SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + SpringCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); // optional non-nullable -> @JsonInclude(NON_NULL) + @JsonSetter(Nulls.SKIP) JavaFileAssert.assertThat(files.get("OptionalNonNullable.java")) 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 079641006ed5..e05593f4cfc6 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 @@ -6540,7 +6540,8 @@ public void requiredNullable_scenario2_requiredNullable() throws IOException { public void requiredNullable_scenario3_optionalNonNullable() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - new HashMap<>()); + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); Path modelFile = files.get("TestModel.kt").toPath(); String content = Files.readString(modelFile); @@ -6570,7 +6571,9 @@ public void requiredNullable_scenario3_optionalNonNullable() throws IOException 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")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); Path modelFile = files.get("TestModel.kt").toPath(); String content = Files.readString(modelFile); @@ -6598,7 +6601,8 @@ public void requiredNullable_scenario3_optionalNonNullable_withOpenApiNullable() public void requiredNullable_scenario3_optionalNonNullable_withDefault() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - new HashMap<>()); + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); Path modelFile = files.get("TestModel.kt").toPath(); String content = Files.readString(modelFile); @@ -6674,6 +6678,7 @@ public void requiredNullable_scenario3_optionalNonNullable_withJackson3() throws Map props = new HashMap<>(); props.put(KotlinSpringServerCodegen.USE_SPRING_BOOT4, "true"); props.put(CodegenConstants.OPENAPI_NULLABLE, "true"); + props.put(KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", props); @@ -6706,6 +6711,21 @@ public void requiredNullable_scenario4_optionalNullable_hasNoJsonIncludeAnnotati assertFileContains(modelFile, "JsonNullable"); } + /** + * Issue #24401 (safe-but-noisy): with no flags set, kotlin-spring defaults to weak/7.23.0 behavior — + * NO policy {@code @field:JsonInclude} or {@code @field:JsonSetter(nulls)} annotations are emitted. + */ + @Test(description = "Issue #24401 – unset flags emit no policy annotations (kotlin-spring)") + public void jsonInclude_unset_emitsNoPolicyAnnotations() 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(); + assertFileNotContains(modelFile, "@field:JsonInclude("); + assertFileNotContains(modelFile, "@field:JsonSetter("); + } + /** * Issue #24401: default matrix for kotlin-spring. required fields -> ALWAYS, * optional non-nullable -> NON_NULL (default policy), optional nullable -> no annotation. @@ -6714,7 +6734,7 @@ public void requiredNullable_scenario4_optionalNullable_hasNoJsonIncludeAnnotati public void jsonInclude_kotlinMatrix_default() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - new HashMap<>()); + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); String content = Files.readString(files.get("TestModel.kt").toPath()); Assert.assertTrue(jsonIncludeBlockFor(content, "requiredNonNullable").contains("@field:JsonInclude(JsonInclude.Include.ALWAYS)"), @@ -6735,7 +6755,8 @@ public void jsonInclude_kotlinMatrix_default() throws IOException { public void jsonInclude_optionalNonNullPolicy_none() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - Map.of(KotlinSpringServerCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + KotlinSpringServerCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); String content = Files.readString(files.get("TestModel.kt").toPath()); Assert.assertFalse(jsonIncludeBlockFor(content, "optionalNonNullable").contains("@field:JsonInclude"), @@ -6798,7 +6819,9 @@ public void jsonInclude_perSchemaImports() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", - Map.of(CodegenConstants.OPENAPI_NULLABLE, "true")); + Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", + KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); // required non-nullable -> @field:JsonInclude(ALWAYS); no setter/nullable machinery Path requiredNonNullable = files.get("RequiredNonNullable.kt").toPath(); @@ -7143,6 +7166,7 @@ public void testIssue24139NullableRefNoJsonSetterNullsFail() throws IOException Map additionalProperties = new HashMap<>(); additionalProperties.put("useBeanValidation", true); additionalProperties.put("openApiNullable", "true"); + additionalProperties.put(KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); Map files = generateFromContract( "src/test/resources/3_1/issue_24139.yaml", From 36ddf95271b9f21de49110c5eb2025652fd3a7dc Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 15:34:58 +0200 Subject: [PATCH 05/20] docs(migration-guide): update migration guide for Jackson annotations changes in 7.25.0 --- docs/migration-guide.adoc | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/docs/migration-guide.adoc b/docs/migration-guide.adoc index 591aebe82c91..d8cde8b16713 100644 --- a/docs/migration-guide.adoc +++ b/docs/migration-guide.adoc @@ -11,6 +11,38 @@ Another approach to find breaking changes is to look at issue and pull requests * link:https://github.com/OpenAPITools/openapi-generator/labels/Breaking%20change%20%28with%20fallback%29[Breaking change (with fallback)] * link:https://github.com/OpenAPITools/openapi-generator/labels/Breaking%20change%20%28without%20fallback%29[Breaking change (without fallback)] +=== From 7.24.x to 7.25.0 (java-spring / kotlin-spring) + +Version `7.24.0` (link:https://github.com/OpenAPITools/openapi-generator/pull/23993[#23993]) started emitting field-level Jackson annotations on model properties for the `spring` and `kotlin-spring` generators: + +* `@JsonInclude(...)` on properties (serialization), and +* `@JsonSetter(nulls = ...)` on optional non-nullable properties (deserialization). + +Field-level `@JsonInclude` overrides the project-wide `ObjectMapper` inclusion policy (for example `spring.jackson.default-property-inclusion=non_empty`), which silently changed the wire contract for projects that upgraded. See link:https://github.com/OpenAPITools/openapi-generator/issues/24401[#24401]. + +Starting with `7.25.0`, emission of these annotations is controlled by two independent, opt-in options. When an option is left **unset**, the generator defaults to the pre-`7.24.0` (`7.23.0`) behavior — *no* annotations are emitted — and logs a warning so the choice is visible even on transitive upgrades. Set the option explicitly to silence the warning. + +==== Serialization: `@JsonInclude` + +* `generateJsonIncludeAnnotations` (boolean) +** unset (default) → no `@JsonInclude` annotations; inclusion is governed entirely by the global `ObjectMapper` (a warning is logged). +** `false` → same weak behavior, warning silenced. +** `true` → emit spec-honest `@JsonInclude` annotations (required-field contract protection plus the optional non-nullable policy below). +* `optionalNonNullPropertyJsonInclude` (enum, default `NON_NULL`) → the policy emitted for optional non-nullable properties when `generateJsonIncludeAnnotations=true`. One of `NON_NULL` / `NON_EMPTY` / `NON_DEFAULT` / `NONE` (`NONE` emits nothing). + +A per-property override set via the `x-jackson-json-include-policy` vendor extension always wins, regardless of these flags. + +==== Deserialization: `@JsonSetter(nulls = ...)` + +* `generateJsonSetterNullsAnnotations` (boolean) +** unset (default) → no `@JsonSetter(nulls = ...)` annotations; null-handling is governed by the global `ObjectMapper` (a warning is logged). +** `false` → same weak behavior, warning silenced. +** `true` → emit `@JsonSetter(nulls = ...)` on optional non-nullable properties. + +==== Note + +`@JsonInclude(NON_ABSENT)` is no longer emitted on `JsonNullable` fields: the `JsonNullable` module already governs their inclusion, so the annotation was redundant. + === From 3.x to 4.0.0 Version `4.0.0` is a major release, which contains some breaking changes without fallback. From cf57992f96becd773804630f49022c7a5a331cc3 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 15:35:13 +0200 Subject: [PATCH 06/20] Revert "update documentation" This reverts commit ed876b9395fffa557c208d1053999ee1a31a048a. --- docs/generators/java-camel.md | 2 -- docs/generators/kotlin-spring.md | 2 -- docs/generators/spring.md | 2 -- 3 files changed, 6 deletions(-) diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 97c2304f5b83..2e2d5191f02f 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -64,7 +64,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBuilders|Whether to generate builders for models| |false| |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false| |generateGenericResponseEntity|Use a generic type for the `ResponseEntity` wrapping return values of generated API methods. If enabled, method are generated with return type ResponseEntity<?>| |false| -|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When false, all automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) are omitted so the global ObjectMapper owns inclusion. A per-property override set via the `x-jackson-json-include-policy` vendor extension is still honored.| |true| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| @@ -84,7 +83,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelPackage|package for generated models| |org.openapitools.model| |openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true| |optionalAcceptNullable|Use `ofNullable` instead of just `of` to accept null values when using Optional.| |true| -|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 54d80c1ea7b1..f42388d53000 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -33,7 +33,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**source**
Publish the original input OpenAPI specification.
**springdoc**
Generate an OpenAPI 3 specification using SpringDoc.
|springdoc| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original| |exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true| -|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When false, all automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) are omitted so the global ObjectMapper owns inclusion. A per-property override set via the `x-jackson-json-include-policy` vendor extension is still honored.| |true| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |gradleBuildFile|generate a gradle build file using the Kotlin DSL| |true| @@ -45,7 +44,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelMutable|Create mutable models| |false| |modelPackage|model package for generated code| |org.openapitools.model| |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| -|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |packageName|Generated artifact package name.| |org.openapitools| |parcelizeModels|toggle "@Parcelize" for generated models| |null| |reactive|use coroutines for reactive behavior| |false| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 194a1c7a1b40..31f5f55ff4a5 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBuilders|Whether to generate builders for models| |false| |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false| |generateGenericResponseEntity|Use a generic type for the `ResponseEntity` wrapping return values of generated API methods. If enabled, method are generated with return type ResponseEntity<?>| |false| -|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When false, all automatic @JsonInclude annotations (required-field protection and the optional non-nullable policy) are omitted so the global ObjectMapper owns inclusion. A per-property override set via the `x-jackson-json-include-policy` vendor extension is still honored.| |true| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| @@ -77,7 +76,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelPackage|package for generated models| |org.openapitools.model| |openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true| |optionalAcceptNullable|Use `ofNullable` instead of just `of` to accept null values when using Optional.| |true| -|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| From d34ea7ee16321264f2e1b5d472ab9471d79354bb Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 15:35:14 +0200 Subject: [PATCH 07/20] Revert "update samples and documentation" This reverts commit 6408e37698c48e204dc52ff8325a3e0bba23e1a9. --- .../src/main/java/org/openapitools/model/Pet.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../model/AdditionalPropertiesClassDto.java | 1 + .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 - .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../org/openapitools/model/NullableMapPropertyDto.java | 2 ++ .../org/openapitools/model/ParentWithNullableDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ------ .../org/openapitools/model/TypeHolderExampleDto.java | 7 ------- .../model/AdditionalPropertiesClassDto.java | 1 + .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 - .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../org/openapitools/model/NullableMapPropertyDto.java | 2 ++ .../org/openapitools/model/ParentWithNullableDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ------ .../org/openapitools/model/TypeHolderExampleDto.java | 7 ------- .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../openapitools/model/ContainerDefaultValueDto.java | 3 --- .../main/java/org/openapitools/model/EnumTestDto.java | 1 - .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ------ .../org/openapitools/model/TypeHolderExampleDto.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../model/AdditionalPropertiesClassDto.java | 1 + .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 - .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../org/openapitools/model/NullableMapPropertyDto.java | 2 ++ .../org/openapitools/model/ParentWithNullableDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ------ .../org/openapitools/model/TypeHolderExampleDto.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Apple.java | 3 --- .../src/main/java/org/openapitools/model/Banana.java | 3 --- .../src/main/java/org/openapitools/model/Bar.java | 1 - .../src/main/java/org/openapitools/model/Entity.java | 1 - .../main/java/org/openapitools/model/EntityRef.java | 1 - .../main/java/org/openapitools/model/Extensible.java | 1 - .../src/main/java/org/openapitools/model/Fruit.java | 1 - .../src/main/java/org/openapitools/model/Apple.java | 3 --- .../src/main/java/org/openapitools/model/Banana.java | 3 --- .../src/main/java/org/openapitools/model/Bar.java | 1 - .../src/main/java/org/openapitools/model/Entity.java | 1 - .../main/java/org/openapitools/model/EntityRef.java | 1 - .../main/java/org/openapitools/model/Extensible.java | 1 - .../src/main/java/org/openapitools/model/Fruit.java | 1 - .../src/main/java/org/openapitools/model/Apple.java | 3 --- .../src/main/java/org/openapitools/model/Banana.java | 3 --- .../src/main/java/org/openapitools/model/Bar.java | 1 - .../src/main/java/org/openapitools/model/Entity.java | 1 - .../main/java/org/openapitools/model/EntityRef.java | 1 - .../main/java/org/openapitools/model/Extensible.java | 1 - .../src/main/java/org/openapitools/model/Fruit.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Foo.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/kotlin/org/openapitools/model/Cat.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Dog.kt | 3 --- .../src/main/kotlin/org/openapitools/model/Pet.kt | 1 - .../src/main/kotlin/org/openapitools/model/Bird.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Robobird.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Car.kt | 3 --- .../src/main/kotlin/org/openapitools/model/Truck.kt | 3 --- .../src/main/kotlin/org/openapitools/model/Vehicle.kt | 1 - .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../kotlin/org/openapitools/model/AnyOfUserOrPet.kt | 3 --- .../openapitools/model/AnyOfUserOrPetOrArrayString.kt | 3 --- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/User.kt | 1 - .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Apa.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Cat.kt | 3 --- .../src/main/kotlin/org/openapitools/model/Dog.kt | 6 ------ .../src/main/kotlin/org/openapitools/model/ApiError.kt | 1 - .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/PageMeta.kt | 5 ----- .../src/main/kotlin/org/openapitools/model/Pet.kt | 1 - .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Cat.kt | 1 - .../src/main/kotlin/org/openapitools/model/Category.kt | 1 - .../src/main/kotlin/org/openapitools/model/Dog.kt | 1 - .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../kotlin/org/openapitools/model/NullableModel.kt | 3 +-- .../src/main/kotlin/org/openapitools/model/Pet.kt | 1 - .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../src/main/kotlin/org/openapitools/model/Cat.kt | 3 --- .../src/main/kotlin/org/openapitools/model/Dog.kt | 6 ------ .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../org/openapitools/model/ObjectWithUniqueItems.java | 2 ++ .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 3 --- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../model/AdditionalPropertiesClassDto.java | 1 + .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 - .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../org/openapitools/model/NullableMapPropertyDto.java | 2 ++ .../org/openapitools/model/ParentWithNullableDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ------ .../org/openapitools/model/TypeHolderExampleDto.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../src/main/java/org/openapitools/model/PageMeta.java | 5 ----- .../src/main/java/org/openapitools/model/Pet.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../java/org/openapitools/model/NullableModel.java | 3 +-- .../src/main/java/org/openapitools/model/Pet.java | 1 - .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../openapitools/model/AdditionalPropertiesClass.java | 1 + .../src/main/java/org/openapitools/model/Animal.java | 1 - .../src/main/java/org/openapitools/model/Category.java | 1 - .../org/openapitools/model/ContainerDefaultValue.java | 4 ++-- .../src/main/java/org/openapitools/model/EnumTest.java | 1 - .../main/java/org/openapitools/model/FormatTest.java | 4 ---- .../src/main/java/org/openapitools/model/Name.java | 1 - .../org/openapitools/model/NullableMapProperty.java | 2 ++ .../org/openapitools/model/ParentWithNullable.java | 1 + .../src/main/java/org/openapitools/model/Pet.java | 2 -- .../java/org/openapitools/model/TypeHolderDefault.java | 6 ------ .../java/org/openapitools/model/TypeHolderExample.java | 7 ------- .../virtualan/model/AdditionalPropertiesClass.java | 1 + .../java/org/openapitools/virtualan/model/Animal.java | 1 - .../org/openapitools/virtualan/model/Category.java | 1 - .../virtualan/model/ContainerDefaultValue.java | 4 ++-- .../org/openapitools/virtualan/model/EnumTest.java | 1 - .../org/openapitools/virtualan/model/FormatTest.java | 4 ---- .../java/org/openapitools/virtualan/model/Name.java | 1 - .../virtualan/model/NullableMapProperty.java | 2 ++ .../virtualan/model/ParentWithNullable.java | 1 + .../java/org/openapitools/virtualan/model/Pet.java | 2 -- .../virtualan/model/TypeHolderDefault.java | 6 ------ .../virtualan/model/TypeHolderExample.java | 7 ------- .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../main/java/org/openapitools/model/EnumTestDto.java | 2 +- .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../org/openapitools/model/HealthCheckResultDto.java | 2 ++ .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../java/org/openapitools/model/NullableClassDto.java | 10 ++++++++++ .../model/OuterObjectWithEnumPropertyDto.java | 2 -- .../org/openapitools/model/ParentWithNullableDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../model/AdditionalPropertiesClassDto.java | 1 + .../main/java/org/openapitools/model/AnimalDto.java | 1 - .../main/java/org/openapitools/model/CategoryDto.java | 1 - .../openapitools/model/ContainerDefaultValueDto.java | 4 ++-- .../main/java/org/openapitools/model/EnumTestDto.java | 1 - .../java/org/openapitools/model/FormatTestDto.java | 4 ---- .../src/main/java/org/openapitools/model/NameDto.java | 1 - .../org/openapitools/model/NullableMapPropertyDto.java | 2 ++ .../org/openapitools/model/ParentWithNullableDto.java | 1 + .../src/main/java/org/openapitools/model/PetDto.java | 2 -- .../org/openapitools/model/TypeHolderDefaultDto.java | 6 ------ .../org/openapitools/model/TypeHolderExampleDto.java | 7 ------- 426 files changed, 150 insertions(+), 906 deletions(-) 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 83c89d9c9800..4aa4e0f36117 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 @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType = "Pet"; @JsonInclude(JsonInclude.Include.NON_NULL) 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 53b64044c6e3..0d9d99f20e09 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable name = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private List photoUrls = new ArrayList<>(); 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 141ad532407c..f655d26b20a7 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 fb95071ae45f..46a16d7fe21d 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 @@ -58,6 +58,7 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 ccfe65d189e1..c724049e493b 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 44a1a1ea0b01..20129cb89013 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 @@ -27,7 +27,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index d88271c2bf46..ccb8f5a5647f 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -29,14 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 250a8a7fa9fb..9c39a7569a81 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 @@ -103,7 +103,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0db61103ab8a..ac2ef6be7859 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 @@ -39,7 +39,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,13 +50,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -68,7 +65,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 9dcea8d6c27b..e11dd113cbc2 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index f84d9d21f9cf..350b970a945d 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class NullableMapPropertyDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 cb3f764522a6..1d18853e2e2e 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 b4eda9e7f9c4..2052979417f7 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 @@ -39,10 +39,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index a1c213eb40de..99d18a336d78 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,19 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index b0f401268821..b0faf5aaa9ae 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 613b36dd183c..b893bb4ec7c6 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 67474f01ec05..e301cd61dba3 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 ca80887aed58..5c51fa54cc0a 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 @@ -26,7 +26,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index fe0be24e229d..af2b07f95d73 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 5069a1a9acbb..5263a4e2bc96 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 @@ -102,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 c68a2728bcb1..18101da678fa 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 @@ -38,7 +38,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -50,13 +49,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -67,7 +64,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 b6b48d488ede..0d4be7ac8140 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 @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index d9edf72050f1..f93832a65c98 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class NullableMapPropertyDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 af08c71fb48f..2300afd143a4 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 @@ -74,6 +74,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 791eea25f843..0ce2b93a2b0f 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 @@ -38,10 +38,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 8ca218f8c704..987983e43451 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index eea548352cc7..4db40f3db382 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 72a715bd0e20..2bec6c231fc2 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 @@ -36,10 +36,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 d143dbf68f9c..0cd4c4edbd58 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 @@ -56,6 +56,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 fe52d0aa116a..282ca2ce689b 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 a606369f1c61..6778a62dfd5e 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 @@ -25,7 +25,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index ca932fee5f0f..16f74d8223aa 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -27,14 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 58945182bd97..54c2c98f7fe4 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 @@ -103,7 +103,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 fe3df02f9da4..c2dc9d17f0b8 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 @@ -39,7 +39,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -51,13 +50,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -68,7 +65,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 1edf0813d0b5..07be2f99663a 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 @@ -22,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index dff5aa4523f8..3abb813498f2 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -26,6 +27,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 9b895427687b..79e274840817 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 @@ -74,6 +74,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 2e84df56c536..be762175a56b 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 @@ -37,10 +37,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7aedd82ea28e..1f8e4dc3d890 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java index f1609752ba2f..d37cdc713ec3 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 b266f37f4576..120027d72686 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 @@ -55,6 +55,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 29ecd6ae4724..f5d220bc1b43 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 @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 dd15acc4171f..bcd733ba06d7 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 @@ -24,7 +24,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 31a8133cb94f..a348b064c179 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,14 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 07926663552d..c62cf18d0eee 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 @@ -102,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 f4aea008dfa3..c0831401197a 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 @@ -38,7 +38,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -50,13 +49,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -67,7 +64,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 5be398a7e1c9..f237f6637dd5 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 @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index 5e0395f3fd34..d5fda5613396 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 a2e4fd94701a..40350659ae78 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 @@ -73,6 +73,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 906fa96ae1ee..89685de90050 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java index e8978ec83178..4bf6cba777df 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java index 4caccae69640..5e77ca347711 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 b266f37f4576..120027d72686 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 @@ -55,6 +55,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 29ecd6ae4724..f5d220bc1b43 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 @@ -35,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 dd15acc4171f..bcd733ba06d7 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 @@ -24,7 +24,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 31a8133cb94f..a348b064c179 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -26,14 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 07926663552d..c62cf18d0eee 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 @@ -102,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 f4aea008dfa3..c0831401197a 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 @@ -38,7 +38,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -50,13 +49,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -67,7 +64,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 5be398a7e1c9..f237f6637dd5 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 @@ -21,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index 5e0395f3fd34..d5fda5613396 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -25,6 +26,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 a2e4fd94701a..40350659ae78 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 @@ -73,6 +73,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 906fa96ae1ee..89685de90050 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index e8978ec83178..4bf6cba777df 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +24,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 4caccae69640..5e77ca347711 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 3e9eafcccd85..79eb758c01f0 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 @@ -39,7 +39,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 13fb12b7ecd2..a7974b8569f2 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 @@ -29,7 +29,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index b5627e929b6b..b28ffec6be94 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,10 +28,8 @@ public class ContainerDefaultValueDto { private @Nullable List nullableArray; - @JsonInclude(JsonInclude.Include.ALWAYS) private List nullableRequiredArray; - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private @Nullable List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); 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 cf17977dfcac..f94de0c9c545 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 @@ -105,7 +105,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 9b9fcb4d1bf8..e6c0613fa656 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 @@ -41,7 +41,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -53,13 +52,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -70,7 +67,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 bc3e2c3c5da0..809f87f431c2 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 @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 8e339b8f2701..30524a3fe8d0 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 @@ -41,10 +41,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index c0325225555f..e92f8c79ef5f 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,19 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 522e6a5f3520..0400294f91bc 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +27,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 a3e051349288..5daca86cbb74 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 e4e0790b3e92..2e8e804a79d3 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 3455dcf8b80b..08c3a1d9091a 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 219aeb0cd0ed..09216052292e 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 671101c3ca77..bab57721b404 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 17566a89eeda..6c85cd100777 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 aa4b273b332e..9b15554afbc6 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 @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java index c25a2eaa55bf..d606c62a8fcf 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 fde0586fa40c..d6a067cca4e5 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 a879f5ebd770..f4272d0f6c80 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java index ac5a2fd1272b..a3fc75dcc4f8 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java index faf1e1ff30ef..4171f01f6aed 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 613b36dd183c..b893bb4ec7c6 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 67474f01ec05..e301cd61dba3 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 ca80887aed58..5c51fa54cc0a 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 @@ -26,7 +26,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index fe0be24e229d..af2b07f95d73 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 5069a1a9acbb..5263a4e2bc96 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 @@ -102,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 c68a2728bcb1..18101da678fa 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 @@ -38,7 +38,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -50,13 +49,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -67,7 +64,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 b6b48d488ede..0d4be7ac8140 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 @@ -23,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index d9edf72050f1..f93832a65c98 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class NullableMapPropertyDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 af08c71fb48f..2300afd143a4 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 @@ -74,6 +74,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 791eea25f843..0ce2b93a2b0f 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 @@ -38,10 +38,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 8ca218f8c704..987983e43451 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index eea548352cc7..4db40f3db382 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 590fef4efc14..819444909ebb 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 @@ -34,10 +34,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional category = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 9308a4a8eed9..e7ed1e26b8fa 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 @@ -35,10 +35,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 83c89d9c9800..4aa4e0f36117 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 @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType = "Pet"; @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 56776316e18b..d5f2df7bca2b 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 cf8d702378be..212def45ba53 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 5e934e643224..9fcdefe1da2e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 65e0ceefa324..aeb76fdcd3b2 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 3f9be180fd12..526aa66a1882 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 ad228020783e..87c1af437ed4 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 2905cdf83cf0..ab6a00effad0 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index 8eb2ebe70171..56da244f404e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index 7547cfb95047..2796a8f8c4ec 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 141ad532407c..f655d26b20a7 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java index 0f2566549e46..3ea2af2720cd 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Apple implements Fruit { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; - @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java index d6f893866d1e..8b42e4bccec3 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Banana implements Fruit { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; - @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 183cf2f6e604..93a0bdb89f2a 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 @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Bar extends Entity implements BarRefOrValue { - @JsonInclude(JsonInclude.Include.NON_NULL) private String id; @JsonInclude(JsonInclude.Include.NON_NULL) 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 d3b3476145d6..c6bff315d94c 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 @@ -52,7 +52,6 @@ public class Entity { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 fb39bfa8fd71..c3e7425d99a4 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 @@ -48,7 +48,6 @@ public class EntityRef { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; @JsonInclude(JsonInclude.Include.NON_NULL) 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 5426785a0d55..6b1a418efa4e 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 @@ -29,7 +29,6 @@ public class Extensible { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java index 2233230221a9..3d77543df254 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java @@ -3,7 +3,6 @@ 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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java index 3cb15460b8cf..f98df374ed7a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Apple implements Fruit { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; - @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java index 1796fc81d4be..b168fc3d764e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Banana implements Fruit { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; - @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 0a385721560a..c27bcfa659c7 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 @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Bar extends Entity implements BarRefOrValue { - @JsonInclude(JsonInclude.Include.NON_NULL) private String id; @JsonInclude(JsonInclude.Include.NON_NULL) 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 10167c1164ee..4a0620729d17 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 @@ -52,7 +52,6 @@ public sealed class Entity permits Bar, BarCreate, Foo, Pasta, Pizza { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 6d9b7196a1ee..33e1b724576b 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 @@ -48,7 +48,6 @@ public sealed class EntityRef permits BarRef, FooRef { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; @JsonInclude(JsonInclude.Include.NON_NULL) 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 bf5afd3ab33b..b9e911f48fa7 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 @@ -29,7 +29,6 @@ public final class Extensible { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java index a9901953bd7e..45b655f0ce22 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java @@ -3,7 +3,6 @@ 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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java index cd02d6d6bdab..0be64c62685f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Apple implements Fruit { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; - @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java index cd3bb74e50bd..cb801806025f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Banana implements Fruit { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; - @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 9854268cedbe..acaa8e50aa91 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 @@ -29,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Bar extends Entity implements BarRefOrValue { - @JsonInclude(JsonInclude.Include.NON_NULL) private String id; @JsonInclude(JsonInclude.Include.NON_NULL) 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 0068e39ff4cc..3614b2ed6844 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 @@ -52,7 +52,6 @@ public class Entity { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 782967688b0e..28083ecc80a2 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 @@ -48,7 +48,6 @@ public class EntityRef { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; @JsonInclude(JsonInclude.Include.NON_NULL) 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 ee4781a36c64..1ea149bee2a5 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 @@ -29,7 +29,6 @@ public class Extensible { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; - @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java index 2233230221a9..3d77543df254 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java @@ -3,7 +3,6 @@ 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-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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 0ff80dbce269..34fefa217937 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 @@ -44,10 +44,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 8b46bc621498..76e94c5b80a7 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 @@ -43,10 +43,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 127fd2f64399..38e257be4546 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 @@ -50,7 +50,6 @@ public class Foo { @JsonInclude(JsonInclude.Include.NON_NULL) private List listMinIntems = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime requiredDt; 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 93a856e10555..ce7523e6fee7 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 @@ -45,10 +45,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 47e43e89eb8a..aa7e8049ad41 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 @@ -34,10 +34,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt index 4887b45e853b..d5af2e05d658 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt @@ -2,7 +2,6 @@ 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.JsonValue import com.fasterxml.jackson.annotation.JsonIgnoreProperties @@ -25,7 +24,6 @@ import jakarta.validation.Valid */ data class Cat( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("huntingSkill") @get:JsonProperty("huntingSkill", required = true) val huntingSkill: Cat.HuntingSkill, diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt index 599607754f1d..de31e3c6a74b 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt @@ -1,7 +1,6 @@ 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.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties @@ -26,12 +25,10 @@ import jakarta.validation.Valid data class Dog( @field:Valid - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String = "dog", @get:Min(value=0) - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("packSize") @get:JsonProperty("packSize", required = true) val packSize: kotlin.Int = 0 ) : Pet { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt index 373c49ea1ab7..40869b85e6bb 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt @@ -3,7 +3,6 @@ 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.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo 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 cf8ed4566029..c5611ef934c7 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 @@ -27,11 +27,9 @@ import jakarta.validation.Valid */ data class Bird( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "BIRD", - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_BIRD", 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 374a42c3886d..e11c5a0a1af1 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 @@ -27,11 +27,9 @@ import jakarta.validation.Valid */ data class Robobird( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "ROBOBIRD", - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_ROBOBIRD", diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt index 831595203de0..f4e25930868d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt @@ -2,7 +2,6 @@ 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.JsonValue import org.openapitools.model.VehicleType @@ -27,11 +26,9 @@ import jakarta.validation.Valid data class Car( @field:Valid - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.CAR, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("numDoors") @get:JsonProperty("numDoors", required = true) val numDoors: kotlin.Int ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt index 723e2f2376e8..61b3bda8c499 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt @@ -2,7 +2,6 @@ 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.JsonValue import org.openapitools.model.VehicleType @@ -27,11 +26,9 @@ import jakarta.validation.Valid data class Truck( @field:Valid - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.TRUCK, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("payloadCapacity") @get:JsonProperty("payloadCapacity", required = true) val payloadCapacity: java.math.BigDecimal ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt index afd7fad1a33d..637caa41c0e0 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt @@ -3,7 +3,6 @@ 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.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo 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 d37fcde397d1..978290446045 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 @@ -30,11 +30,9 @@ import javax.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 818ca34ee824..ebd784c67532 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 818ca34ee824..ebd784c67532 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 818ca34ee824..ebd784c67532 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 818ca34ee824..ebd784c67532 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 818ca34ee824..ebd784c67532 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 28f9f7e2cf42..b0c7a8a472e2 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 @@ -41,17 +41,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPet( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 7e5d66de499d..245556f67207 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 @@ -41,17 +41,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPetOrArrayString( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 ab6822d9644c..edcf36d7df67 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 e16108c6b858..67857d6d788d 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 @@ -32,7 +32,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, 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 4734ca04df3e..0de23f8edb3c 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 @@ -33,11 +33,9 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 7cf3de7d9c48..56c523367969 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 @@ -30,11 +30,9 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 7cf3de7d9c48..56c523367969 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 @@ -30,11 +30,9 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 7cf3de7d9c48..56c523367969 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 @@ -30,11 +30,9 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 f6f096f6eed4..c076750eb99a 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 @@ -30,11 +30,9 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 9ec6249ca10e..70d1f73e208f 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 @@ -28,12 +28,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Apa( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bepa") @get:JsonProperty("bepa", required = true) val bepa: java.math.BigDecimal = java.math.BigDecimal("0"), @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("cepa") @get:JsonProperty("cepa", required = true) val cepa: java.math.BigDecimal = java.math.BigDecimal("6.28318"), 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 7cd760e87cc8..0aa99a764a76 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 0a072512fd08..45c87638f15f 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 0869716cacdd..4db812f3390c 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 @@ -37,17 +37,14 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 9cd0d8edc3f8..301b4c80b12f 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 @@ -38,32 +38,26 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) val breed: Dog.Breed, @ApiModelProperty(required = true, value = "Whether the dog enjoys fetching") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 eb40a7638b18..c7effc69943c 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 @@ -26,7 +26,6 @@ import jakarta.validation.Valid */ data class ApiError( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("errorCode") @get:JsonProperty("errorCode", required = true) val errorCode: ApiError.ErrorCode, 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 5be374053e68..3f3a4d005b5b 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) var name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) var photoUrls: kotlin.collections.MutableList, 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 572741c45089..d5959182a70f 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 @@ -30,11 +30,9 @@ import javax.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 572741c45089..d5959182a70f 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 @@ -30,11 +30,9 @@ import javax.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt index a40d0746abed..d2938312720f 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt @@ -1,7 +1,6 @@ package org.openapitools.model import java.util.Objects -import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -22,19 +21,15 @@ import jakarta.validation.Valid */ data class PageMeta( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("size") @get:JsonProperty("size", required = true) val propertySize: kotlin.Long, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("number") @get:JsonProperty("number", required = true) val number: kotlin.Long, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("totalElements") @get:JsonProperty("totalElements", required = true) val totalElements: kotlin.Long, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("totalPages") @get:JsonProperty("totalPages", required = true) val totalPages: kotlin.Long ) : 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 1fef46231b24..983d1f583f52 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 @@ -23,7 +23,6 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, 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 0a072512fd08..45c87638f15f 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 0a072512fd08..45c87638f15f 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 3ded71b1e461..148d5e215f21 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 @@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class Cat( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, 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 48a8f76d11bf..0349895b01be 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 @@ -24,7 +24,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String = "default-name", 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 f6565a59f920..856de1f1a7b0 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 @@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class Dog( @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, 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 664fcc2f0214..3933754b80f8 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.Set, 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 808f5695c0c8..9ed84667a2bd 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 @@ -25,11 +25,9 @@ import jakarta.validation.Valid */ data class NullableModel( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("requiredNonNullable") @get:JsonProperty("requiredNonNullable", required = true) val requiredNonNullable: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("requiredNullable") @get:JsonProperty("requiredNullable", required = true) val requiredNullable: kotlin.String?, @@ -38,6 +36,7 @@ data class NullableModel( @param:JsonProperty("optionalNonNullable") @get:JsonProperty("optionalNonNullable") val optionalNonNullable: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_ABSENT) @param:JsonProperty("optionalNullable") @get:JsonProperty("optionalNullable") val optionalNullable: JsonNullable = JsonNullable.undefined() ) : java.io.Serializable { 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 3adf7cb3f88b..11b4702d5b38 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 @@ -23,7 +23,6 @@ import jakarta.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, 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 121502d59510..3de771e29973 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 @@ -32,12 +32,10 @@ import io.swagger.annotations.ApiModelProperty data class Pet( @ApiModelProperty(example = "doggie", required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 298428490fdf..2f4708fe0104 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 @@ -32,12 +32,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 0869716cacdd..4db812f3390c 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 @@ -37,17 +37,14 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 911756347da6..2202f4aae40b 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 @@ -38,32 +38,26 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) override val bark: kotlin.Boolean, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) override val breed: Dog.Breed, @ApiModelProperty(required = true, value = "Whether the dog enjoys fetching") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, 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 c98aeda868da..a94d6438c2b5 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 @@ -31,11 +31,9 @@ import javax.validation.Valid */ data class Pet( - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 430f680158d4..30bc93ff4da5 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 @@ -33,11 +33,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ObjectWithUniqueItems { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullSet = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) private Set notNullSet = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullList = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 d5fdd45f18f4..0364cbeb451f 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 @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 cca98c14da84..0920e9972f19 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 @@ -27,7 +27,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 6674c88a2e4f..518f33493840 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ public class ContainerDefaultValue { private @Nullable List nullableArray; - @JsonInclude(JsonInclude.Include.ALWAYS) private List nullableRequiredArray; - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private @Nullable List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); 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 171acfa4ae03..c5b52e5f1168 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 @@ -105,7 +105,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e48c14544a78..12be011e4b50 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 @@ -41,7 +41,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -53,13 +52,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -70,7 +67,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 78dc53df6d91..e9a7f9cc9d8a 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 @@ -25,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 26e826f8fbc9..6a20ec90e83f 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 @@ -39,10 +39,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index df8b8fbcdb51..e1ddc677876c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +25,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index 3b3204e03b16..088b142a7513 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +25,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 32023ee3da1e..86be6e693c91 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 6ce4f7f8914c..f5dda830a79d 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 11e1022ae3d3..48bdaa9344f8 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b6557ceff4e9..30539406b232 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 8d3ed031d65d..ef143d4788e3 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 150781082c6d..c81f93c993ea 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 76e74fd67579..bd408cc22a7c 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index e2ceeea637fe..897b2fe03dd2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty() { 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 50c34a0c9121..6f7cb3fcb82c 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable() { 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 ea586df2067a..4a92bd5c7782 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index d3800560158c..157504edc6d6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 03b53c193ee8..405f1100a495 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 bdce7e27156f..c4d654ac44a6 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 @@ -34,10 +34,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 3f6cf5af234f..3a1809dfa191 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 dac8f14035fc..99e7a4cdca08 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 d15dbbf7d60c..75246c9ff8ce 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 1e996c854efe..0e937a87f12b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 795d53cd01a6..c8c06116f9a1 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 79dc8a7432ae..e99a9a785740 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4fd62bd3f389..3a21421bf13c 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 56d45c3ad292..14cce68e1223 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 af16949486cc..2b706856fd92 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 1b1399efc065..cf4719096fb0 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 57fabf941047..7cc05e11b994 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index ab33d9a13ef8..a2f08996fefa 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 9ea7f74985a9..37d3f00f767f 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 @@ -59,6 +59,7 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 fe05be4b1c68..234aef7fb345 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 @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e62f4eb17757..b54dbbd66b7f 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 @@ -28,7 +28,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 2bc02f7a7cc3..fe421ec5cd1d 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -30,14 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 4d3330046620..7bd7ee977200 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e4f7ebda46b3..5894378400d2 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 @@ -40,7 +40,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 6055fd7ceb2d..6561257a70c2 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 @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 98ba228cdc9b..e82c4b3a1679 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class NullableMapPropertyDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 982f8d038258..b4a5e5095239 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 @@ -76,6 +76,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 84bb38e9fc00..a760602c8d73 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 @@ -40,10 +40,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 4fba162597a9..f59eb21da480 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,19 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index fb1d40011dac..4b7506f903ec 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +28,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 d4c997738f18..abb9aa57acef 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 @@ -52,7 +52,6 @@ public class Pet { @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("name") - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @@ -60,7 +59,6 @@ public class Pet { @JsonProperty("photoUrls") @lombok.Builder.Default - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); 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 1a5e177b89a4..3819f2efd3fb 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 @@ -41,10 +41,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java index a1a34c2041d5..6c356b8a5b13 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.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,16 +24,12 @@ public class PageMeta implements Serializable { private static final long serialVersionUID = 1L; - @JsonInclude(JsonInclude.Include.NON_NULL) private Long size; - @JsonInclude(JsonInclude.Include.NON_NULL) private Long number; - @JsonInclude(JsonInclude.Include.NON_NULL) private Long totalElements; - @JsonInclude(JsonInclude.Include.NON_NULL) private Long totalPages; public PageMeta() { 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 5bbe5fb75ae0..477568049136 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 @@ -28,7 +28,6 @@ public class Pet implements Serializable { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 c16ac8affc4e..37d29c32b8da 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 @@ -36,10 +36,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 fc4f770ac1d9..4798bc0c028d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 7812e1c12382..2f923496661e 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a51bd99c90fc..4a0936f8a784 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 0cb8e0d45c2d..b4d90992ea4c 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index 31127013b739..7330185d2021 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d394b3e38431..d095e6659db9 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 728f7cad250d..673bb2e90254 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 79d663d04658..81f9284d385e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 e6fa1ccea8b4..cad9a99b10f5 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 @@ -28,15 +28,14 @@ public class NullableModel implements Serializable { private static final long serialVersionUID = 1L; - @JsonInclude(JsonInclude.Include.NON_NULL) private String requiredNonNullable; - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable requiredNullable = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String optionalNonNullable; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable optionalNullable = JsonNullable.undefined(); public NullableModel() { 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 5ec773c75180..81f0dd9c6551 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 @@ -28,7 +28,6 @@ public class Pet implements Serializable { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 bceaaab0ee8e..4e0c294dd76c 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e24c2373ad81..cb174a615f9b 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 63a0767c6aba..e58434a4f202 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 @@ -35,10 +35,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 94004510586d..e3ff9a400f74 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 bceaaab0ee8e..4e0c294dd76c 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e24c2373ad81..cb174a615f9b 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 63a0767c6aba..e58434a4f202 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 @@ -35,10 +35,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index 94004510586d..e3ff9a400f74 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 bceaaab0ee8e..4e0c294dd76c 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e24c2373ad81..cb174a615f9b 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 63a0767c6aba..e58434a4f202 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 @@ -35,10 +35,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 94004510586d..e3ff9a400f74 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 bceaaab0ee8e..4e0c294dd76c 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 @@ -36,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 03999441f921..f6a38799c911 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 5bd8c11d9722..cef26523d335 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 e24c2373ad81..cb174a615f9b 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 4b44b936d3e2..2fc98b6fb666 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 63a0767c6aba..e58434a4f202 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 @@ -35,10 +35,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index 94004510586d..e3ff9a400f74 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index 31461adcaef0..8b1470e92bf0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 63a0767c6aba..e58434a4f202 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 @@ -35,10 +35,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 00053ec24f51..1b93d77f015d 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional anytype1 = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 b4710c3479a4..1f7e2da6b646 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 7b32f50b3b7b..76970a34483f 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional id = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 08ffd48ec9d6..ac5c31975e54 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 161dc129156c..4d882356686c 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 83c03f906fc6..0584bf0b3730 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional int64 = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional<@Pattern(regexp = "[a-zA-Z]") String> string = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private Optional binary = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional uuid = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 773544c5edf4..390ab0989b32 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java index ab4c11a99f4f..9856b0d77cd6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 e5e63411d868..22db1d786cd5 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional type = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(TypeEnum type) { 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 ceab4bd69ef0..8d3f1d0cf422 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private Optional category = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 2bab3abf7d07..2a1d1c058908 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 65193abb520e..315db140f253 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 51f8239e6287..a38602c22da4 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 @@ -57,6 +57,7 @@ public class AdditionalPropertiesClass { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 9f6a83b4973f..b200b3f62188 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e4a77578766d..1114456a68a1 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 @@ -26,7 +26,6 @@ public class Category { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index 2bd4f51c4140..e969b98a302b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -28,14 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 65374acc591d..7b02c6226925 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 @@ -104,7 +104,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 92a22136e7a7..d1274d6cf08f 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 @@ -40,7 +40,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTest { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 736006c8b6f5..5e8a32edb738 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 @@ -24,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java index fc013fe70f4c..7db52928c1c6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,6 +28,7 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 bb28729decdd..d092b2fc47d5 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 @@ -75,6 +75,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 6c54f41ddd69..68c3ebd77107 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 @@ -38,10 +38,8 @@ public class Pet { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index b6e5a480c71e..b4242f545bc2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -2,7 +2,6 @@ import java.net.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,19 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index cba300e3a67e..c6167ecb0cd8 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -2,7 +2,6 @@ import java.net.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,22 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 db9084f361ed..eacc2158fcdd 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 @@ -37,7 +37,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto implements com.custompackage.InterfaceToKeep, com.custompackage.WithColor { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 e62f4eb17757..b54dbbd66b7f 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 @@ -28,7 +28,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 1576c5046e33..e64c0995389d 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 @@ -110,7 +110,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -189,6 +188,7 @@ public static EnumNumberEnum fromValue(Double value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable outerEnum = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 b2bcf9fec2d6..9baeea9cc239 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 @@ -40,7 +40,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -55,13 +54,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -72,7 +69,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java index ac09a0a9834b..2b3de797a45a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class HealthCheckResultDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableMessage = JsonNullable.undefined(); public HealthCheckResultDto nullableMessage(String nullableMessage) { 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 6055fd7ceb2d..6561257a70c2 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 @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) 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 55fe5702be7f..99e4c9ecbf90 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 @@ -40,29 +40,39 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableClassDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable integerProp = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable numberProp = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable booleanProp = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable stringProp = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private JsonNullable dateProp = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private JsonNullable datetimeProp = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> arrayNullableProp = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItemsNullable = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> objectNullableProp = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java index ab45923a4570..2bc2073abb6a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class OuterObjectWithEnumPropertyDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private OuterEnumIntegerDto value; public OuterObjectWithEnumPropertyDto() { 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 982f8d038258..b4a5e5095239 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 @@ -76,6 +76,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 5cbf751e6bd4..77a5d6571d54 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 @@ -40,10 +40,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 3115be7ad0b3..d04080bd138a 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 @@ -59,6 +59,7 @@ public class AdditionalPropertiesClassDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Object anytype1; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable anytype2 = JsonNullable.undefined(); @JsonInclude(JsonInclude.Include.NON_NULL) 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 0ea4d126864a..9954743744b8 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 @@ -38,7 +38,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String className; @JsonInclude(JsonInclude.Include.NON_NULL) 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 34487fc4bbc4..e9a8e17231e4 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 @@ -28,7 +28,6 @@ public class CategoryDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 39f4e40b9ba0..935dbf3e6f4d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -30,14 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 bf188bb1b01d..5ab270f93a2e 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 @@ -105,7 +105,6 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** 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 4f54909c543d..13b1eb4fcd2e 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 @@ -40,7 +40,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long int64; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -52,13 +51,11 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String string; - @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; - @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; @@ -69,7 +66,6 @@ public class FormatTestDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable UUID uuid; - @JsonInclude(JsonInclude.Include.NON_NULL) private String password; @JsonInclude(JsonInclude.Include.NON_NULL) 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 a4fdb5f297fd..585d573dfecf 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 @@ -26,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 50958c247610..e712397bff32 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class NullableMapPropertyDto { + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 af2b3803d750..2162ebf85db4 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 @@ -77,6 +77,7 @@ public static TypeEnum fromValue(String value) { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 bbeb1cf7c867..3953250b4693 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 @@ -41,10 +41,8 @@ public class PetDto { @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; - @JsonInclude(JsonInclude.Include.NON_NULL) private String name; - @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 0ef0624afb20..d9d8b4f78585 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,19 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index fbf86a0db3f3..aa7879602dc5 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +28,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { From 061f3179b15d4cacefe2413a0601b4f480f48962 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 15:59:50 +0200 Subject: [PATCH 08/20] feat(json-include): enhance manual per-property JSON include policy handling --- .../languages/KotlinSpringServerCodegen.java | 36 ++++++++++++++++++- .../codegen/languages/SpringCodegen.java | 36 ++++++++++++++++++- .../java/spring/SpringCodegenTest.java | 33 +++++++++++++++++ .../spring/KotlinSpringServerCodegenTest.java | 35 ++++++++++++++++++ .../issue_24401_json_include_per_schema.yaml | 9 +++++ 5 files changed, 147 insertions(+), 2 deletions(-) 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 27f7d287ade5..cae4507cb91b 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 @@ -1409,8 +1409,13 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert */ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property) { if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { - if (isJsonIncludePolicyEmitted(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION))) { + String manualPolicy = resolveManualJsonIncludePolicy(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION)); + if (manualPolicy != null) { + property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, manualPolicy); model.imports.add("JsonInclude"); + } else { + // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. + property.vendorExtensions.remove(JSON_INCLUDE_POLICY_EXTENSION); } return; } @@ -1433,6 +1438,35 @@ private static boolean isJsonIncludePolicyEmitted(Object policy) { return policy != null && !policy.toString().isEmpty() && !"NONE".equalsIgnoreCase(policy.toString()); } + /** + * Valid {@code com.fasterxml.jackson.annotation.JsonInclude.Include} constant names accepted for a + * manual per-property {@code x-jackson-json-include-policy} override. {@code NONE} is a sentinel + * meaning "emit no annotation" and is handled separately (the extension is dropped). + */ + private static final Set VALID_JSON_INCLUDE_CONSTANTS = new HashSet<>(Arrays.asList( + "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS", "CUSTOM")); + + /** + * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. + * + * @return the normalized (upper-case) policy to emit, or {@code null} when the override means + * "emit no annotation" ({@code NONE}/empty), in which case the caller must drop the extension. + * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. + */ + private static String resolveManualJsonIncludePolicy(Object rawPolicy) { + if (!isJsonIncludePolicyEmitted(rawPolicy)) { + return null; + } + String normalized = rawPolicy.toString().trim().toUpperCase(Locale.ROOT); + if (!VALID_JSON_INCLUDE_CONSTANTS.contains(normalized)) { + throw new IllegalArgumentException(JSON_INCLUDE_POLICY_EXTENSION + + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " + + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " + + "no annotation, but was: " + rawPolicy); + } + return normalized; + } + private static String normalizeJsonIncludePolicy(String policy) { if (policy == null) { return "NON_NULL"; 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 0e766dbeb71d..651206c3413e 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 @@ -1295,8 +1295,13 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // optional & non-nullable -> optionalNonNullPropertyJsonInclude (default NON_NULL, NONE = omit) // optional & nullable -> none (JsonNullable module already governs inclusion) if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { - if (isJsonIncludePolicyEmitted(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION))) { + String manualPolicy = resolveManualJsonIncludePolicy(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION)); + if (manualPolicy != null) { + property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, manualPolicy); model.imports.add("JsonInclude"); + } else { + // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. + property.vendorExtensions.remove(JSON_INCLUDE_POLICY_EXTENSION); } } else if (Boolean.TRUE.equals(generateJsonIncludeAnnotations)) { String policy = null; @@ -1316,6 +1321,35 @@ private static boolean isJsonIncludePolicyEmitted(Object policy) { return policy != null && !policy.toString().isEmpty() && !"NONE".equalsIgnoreCase(policy.toString()); } + /** + * Valid {@code com.fasterxml.jackson.annotation.JsonInclude.Include} constant names accepted for a + * manual per-property {@code x-jackson-json-include-policy} override. {@code NONE} is a sentinel + * meaning "emit no annotation" and is handled separately (the extension is dropped). + */ + private static final Set VALID_JSON_INCLUDE_CONSTANTS = new HashSet<>(Arrays.asList( + "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS", "CUSTOM")); + + /** + * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. + * + * @return the normalized (upper-case) policy to emit, or {@code null} when the override means + * "emit no annotation" ({@code NONE}/empty), in which case the caller must drop the extension. + * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. + */ + private static String resolveManualJsonIncludePolicy(Object rawPolicy) { + if (!isJsonIncludePolicyEmitted(rawPolicy)) { + return null; + } + String normalized = rawPolicy.toString().trim().toUpperCase(Locale.ROOT); + if (!VALID_JSON_INCLUDE_CONSTANTS.contains(normalized)) { + throw new IllegalArgumentException(JSON_INCLUDE_POLICY_EXTENSION + + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " + + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " + + "no annotation, but was: " + rawPolicy); + } + return normalized; + } + private static String normalizeJsonIncludePolicy(String policy) { if (policy == null) { return "NON_NULL"; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 7b1e63c40247..7996c876d2b1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -8547,6 +8547,39 @@ void jsonInclude_forcedOverride_onJsonNullable_emitsAnnotationAndImport() throws .containsWithNameAndAttributes("JsonInclude", Map.of("value", "JsonInclude.Include.NON_NULL")); } + /** + * Issue #24401: a manual per-property override of {@code NONE} means "emit no annotation". Neither the + * {@code @JsonInclude} annotation nor its import may be generated, otherwise the output fails to compile. + */ + @Test + void jsonInclude_manualOverride_none_emitsNoAnnotationOrImport() throws IOException { + final String jsonInclude = "com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + + JavaFileAssert.assertThat(files.get("ManualNone.java")) + .hasNoImports(jsonInclude) + .assertProperty("value").assertPropertyAnnotations() + .doesNotContainWithName("JsonInclude"); + } + + /** + * Issue #24401: an invalid manual per-property override must fail fast with an actionable error + * during generation rather than emitting uncompilable Java. + */ + @Test + void jsonInclude_manualOverride_invalid_failsWithActionableError() { + org.assertj.core.api.Assertions.assertThatThrownBy(() -> generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml", + SPRING_BOOT, + Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true"))) + .hasStackTraceContaining("x-jackson-json-include-policy") + .hasStackTraceContaining("NOT_A_REAL_POLICY"); + } + @Test void testStringQuotesInTags_Issue22629() throws IOException { File output = java.nio.file.Files.createTempDirectory("test").toFile().getCanonicalFile(); 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 e05593f4cfc6..d2064c192bca 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 @@ -6882,6 +6882,41 @@ public void jsonInclude_forcedOverride_onJsonNullable_emitsAnnotationAndImport() "forced override on JsonNullable field must be emitted"); } + /** + * Issue #24401: a manual per-property override of {@code NONE} means "emit no annotation". Neither the + * {@code @field:JsonInclude} annotation nor its import may be generated, otherwise the output fails to compile. + */ + @Test(description = "Issue #24401 – manual NONE override emits no annotation or import (kotlin-spring)") + public void jsonInclude_manualOverride_none_emitsNoAnnotationOrImport() throws IOException { + final String jsonInclude = "import com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + + Path manualNone = files.get("ManualNone.kt").toPath(); + assertFileNotContains(manualNone, jsonInclude); + Assert.assertFalse(Files.readString(manualNone).contains("@field:JsonInclude"), + "manual NONE override must emit no @field:JsonInclude annotation"); + } + + /** + * Issue #24401: an invalid manual per-property override must fail fast with an actionable error + * during generation rather than emitting uncompilable Kotlin. + */ + @Test(description = "Issue #24401 – invalid manual override fails fast (kotlin-spring)") + public void jsonInclude_manualOverride_invalid_failsWithActionableError() { + Throwable thrown = Assert.expectThrows(Throwable.class, () -> generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml", + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true"))); + + java.io.StringWriter sw = new java.io.StringWriter(); + thrown.printStackTrace(new java.io.PrintWriter(sw)); + String trace = sw.toString(); + Assert.assertTrue(trace.contains("x-jackson-json-include-policy") && trace.contains("NOT_A_REAL_POLICY"), + "expected an actionable error naming the invalid policy, but got: " + trace); + } + /** * Without openApiNullable the optional+nullable field is a plain {@code Type?} — no * {@code @field:JsonInclude(NON_ABSENT)} should be emitted because {@code JsonNullable} is diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml index c09979cb96c6..1799586edce7 100644 --- a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml @@ -79,3 +79,12 @@ components: type: string nullable: true x-jackson-json-include-policy: NON_NULL + # manual per-property override of NONE: the sentinel means "emit no annotation", so neither the + # @JsonInclude annotation nor its import must be generated (otherwise the output fails to compile). + ManualNone: + type: object + properties: + value: + type: string + nullable: false + x-jackson-json-include-policy: NONE From f7ca22c1e323239756d9d38e7c7871f475ea5070 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 16:38:56 +0200 Subject: [PATCH 09/20] feat(json-include): refactor JSON include policy handling with utility class --- .../languages/KotlinSpringServerCodegen.java | 59 +--------- .../codegen/languages/SpringCodegen.java | 58 +--------- .../codegen/utils/JsonIncludePolicyUtils.java | 106 ++++++++++++++++++ .../java/spring/SpringCodegenTest.java | 20 ++++ .../spring/KotlinSpringServerCodegenTest.java | 19 ++++ ...e_24401_json_include_invalid_override.yaml | 28 +++++ .../issue_24401_json_include_per_schema.yaml | 9 ++ 7 files changed, 194 insertions(+), 105 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java create mode 100644 modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml 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 cae4507cb91b..38b37de1befc 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 @@ -34,6 +34,7 @@ import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; +import org.openapitools.codegen.utils.JsonIncludePolicyUtils; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; @@ -782,7 +783,8 @@ public void processOpts() { if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); } - this.optionalNonNullPropertyJsonInclude = normalizeJsonIncludePolicy(this.optionalNonNullPropertyJsonInclude); + this.optionalNonNullPropertyJsonInclude = JsonIncludePolicyUtils.normalizeJsonIncludePolicy( + this.optionalNonNullPropertyJsonInclude, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); writePropertyBack(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); if (generateJsonIncludeAnnotations == null) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " @@ -1409,7 +1411,8 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert */ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property) { if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { - String manualPolicy = resolveManualJsonIncludePolicy(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION)); + String manualPolicy = JsonIncludePolicyUtils.resolveManualJsonIncludePolicy( + property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION), JSON_INCLUDE_POLICY_EXTENSION); if (manualPolicy != null) { property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, manualPolicy); model.imports.add("JsonInclude"); @@ -1428,62 +1431,12 @@ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty proper } else if (!property.isNullable) { policy = optionalNonNullPropertyJsonInclude; } - if (isJsonIncludePolicyEmitted(policy)) { + if (JsonIncludePolicyUtils.isJsonIncludePolicyEmitted(policy)) { property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, policy); model.imports.add("JsonInclude"); } } - private static boolean isJsonIncludePolicyEmitted(Object policy) { - return policy != null && !policy.toString().isEmpty() && !"NONE".equalsIgnoreCase(policy.toString()); - } - - /** - * Valid {@code com.fasterxml.jackson.annotation.JsonInclude.Include} constant names accepted for a - * manual per-property {@code x-jackson-json-include-policy} override. {@code NONE} is a sentinel - * meaning "emit no annotation" and is handled separately (the extension is dropped). - */ - private static final Set VALID_JSON_INCLUDE_CONSTANTS = new HashSet<>(Arrays.asList( - "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS", "CUSTOM")); - - /** - * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. - * - * @return the normalized (upper-case) policy to emit, or {@code null} when the override means - * "emit no annotation" ({@code NONE}/empty), in which case the caller must drop the extension. - * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. - */ - private static String resolveManualJsonIncludePolicy(Object rawPolicy) { - if (!isJsonIncludePolicyEmitted(rawPolicy)) { - return null; - } - String normalized = rawPolicy.toString().trim().toUpperCase(Locale.ROOT); - if (!VALID_JSON_INCLUDE_CONSTANTS.contains(normalized)) { - throw new IllegalArgumentException(JSON_INCLUDE_POLICY_EXTENSION - + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " - + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " - + "no annotation, but was: " + rawPolicy); - } - return normalized; - } - - private static String normalizeJsonIncludePolicy(String policy) { - if (policy == null) { - return "NON_NULL"; - } - String normalized = policy.trim().toUpperCase(Locale.ROOT); - switch (normalized) { - case "NON_NULL": - case "NON_EMPTY": - case "NON_DEFAULT": - case "NONE": - return normalized; - default: - throw new IllegalArgumentException(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE - + " must be one of NON_NULL, NON_EMPTY, NON_DEFAULT, NONE but was: " + policy); - } - } - @Override public void addImportsToOneOfInterface(List> imports) { if (additionalProperties.containsKey("jackson")) { 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 651206c3413e..b48d0d43c5d5 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 @@ -40,6 +40,7 @@ import org.openapitools.codegen.templating.mustache.SplitStringLambda; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; import org.openapitools.codegen.templating.mustache.TrimWhitespaceLambda; +import org.openapitools.codegen.utils.JsonIncludePolicyUtils; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ProcessUtils; import org.openapitools.codegen.utils.URLPathUtils; @@ -601,7 +602,8 @@ public void processOpts() { if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); } - this.optionalNonNullPropertyJsonInclude = normalizeJsonIncludePolicy(this.optionalNonNullPropertyJsonInclude); + this.optionalNonNullPropertyJsonInclude = JsonIncludePolicyUtils.normalizeJsonIncludePolicy( + this.optionalNonNullPropertyJsonInclude, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); additionalProperties.put(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); if (jackson) { if (generateJsonIncludeAnnotations == null) { @@ -1295,7 +1297,8 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // optional & non-nullable -> optionalNonNullPropertyJsonInclude (default NON_NULL, NONE = omit) // optional & nullable -> none (JsonNullable module already governs inclusion) if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { - String manualPolicy = resolveManualJsonIncludePolicy(property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION)); + String manualPolicy = JsonIncludePolicyUtils.resolveManualJsonIncludePolicy( + property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION), JSON_INCLUDE_POLICY_EXTENSION); if (manualPolicy != null) { property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, manualPolicy); model.imports.add("JsonInclude"); @@ -1310,62 +1313,13 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } else if (!property.isNullable) { policy = optionalNonNullPropertyJsonInclude; } - if (isJsonIncludePolicyEmitted(policy)) { + if (JsonIncludePolicyUtils.isJsonIncludePolicyEmitted(policy)) { property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, policy); model.imports.add("JsonInclude"); } } } - private static boolean isJsonIncludePolicyEmitted(Object policy) { - return policy != null && !policy.toString().isEmpty() && !"NONE".equalsIgnoreCase(policy.toString()); - } - - /** - * Valid {@code com.fasterxml.jackson.annotation.JsonInclude.Include} constant names accepted for a - * manual per-property {@code x-jackson-json-include-policy} override. {@code NONE} is a sentinel - * meaning "emit no annotation" and is handled separately (the extension is dropped). - */ - private static final Set VALID_JSON_INCLUDE_CONSTANTS = new HashSet<>(Arrays.asList( - "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS", "CUSTOM")); - - /** - * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. - * - * @return the normalized (upper-case) policy to emit, or {@code null} when the override means - * "emit no annotation" ({@code NONE}/empty), in which case the caller must drop the extension. - * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. - */ - private static String resolveManualJsonIncludePolicy(Object rawPolicy) { - if (!isJsonIncludePolicyEmitted(rawPolicy)) { - return null; - } - String normalized = rawPolicy.toString().trim().toUpperCase(Locale.ROOT); - if (!VALID_JSON_INCLUDE_CONSTANTS.contains(normalized)) { - throw new IllegalArgumentException(JSON_INCLUDE_POLICY_EXTENSION - + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " - + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " - + "no annotation, but was: " + rawPolicy); - } - return normalized; - } - - private static String normalizeJsonIncludePolicy(String policy) { - if (policy == null) { - return "NON_NULL"; - } - String normalized = policy.trim().toUpperCase(Locale.ROOT); - switch (normalized) { - case "NON_NULL": - case "NON_EMPTY": - case "NON_DEFAULT": - case "NONE": - return normalized; - default: - throw new IllegalArgumentException(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE - + " must be one of NON_NULL, NON_EMPTY, NON_DEFAULT, NONE but was: " + policy); - } - } @Override public CodegenModel fromModel(String name, Schema model) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java new file mode 100644 index 000000000000..e0f0d0b75f85 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java @@ -0,0 +1,106 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.utils; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; + +/** + * Shared resolution/validation logic for the {@code x-jackson-json-include-policy} vendor extension and the + * {@code optionalNonNullPropertyJsonInclude} config option, used by both the {@code spring} and + * {@code kotlin-spring} generators (issue #24401). + */ +public final class JsonIncludePolicyUtils { + + /** Sentinel value meaning "emit no {@code @JsonInclude} annotation". */ + public static final String NONE = "NONE"; + + /** + * Valid {@code com.fasterxml.jackson.annotation.JsonInclude.Include} constant names accepted for a + * manual per-property {@code x-jackson-json-include-policy} override. {@code NONE} is a sentinel + * meaning "emit no annotation" and is handled separately (the extension is dropped). + */ + private static final Set VALID_JSON_INCLUDE_CONSTANTS = new HashSet<>(Arrays.asList( + "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS", "CUSTOM")); + + /** Valid values for the {@code optionalNonNullPropertyJsonInclude} config option. */ + private static final Set VALID_OPTIONAL_NON_NULL_POLICIES = new HashSet<>(Arrays.asList( + "NON_NULL", "NON_EMPTY", "NON_DEFAULT", "NONE")); + + private JsonIncludePolicyUtils() { + } + + /** + * Whether the given policy value (a manual override, or an already-resolved automatic policy) should + * result in an emitted {@code @JsonInclude} annotation. {@code null}, blank/whitespace-only, and the + * {@code NONE} sentinel (after trimming, case-insensitive) all mean "emit nothing". + */ + public static boolean isJsonIncludePolicyEmitted(Object policy) { + if (policy == null) { + return false; + } + String trimmed = policy.toString().trim(); + return !trimmed.isEmpty() && !NONE.equalsIgnoreCase(trimmed); + } + + /** + * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. + * + * @param rawPolicy the raw vendor extension value set directly on the property in the spec + * @param extensionName the vendor extension key, used in the error message (kept generator-agnostic) + * @return the normalized (upper-case) policy to emit, or {@code null} when the override means + * "emit no annotation" ({@code NONE}/blank), in which case the caller must drop the extension. + * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. + */ + public static String resolveManualJsonIncludePolicy(Object rawPolicy, String extensionName) { + if (!isJsonIncludePolicyEmitted(rawPolicy)) { + return null; + } + String normalized = rawPolicy.toString().trim().toUpperCase(Locale.ROOT); + if (!VALID_JSON_INCLUDE_CONSTANTS.contains(normalized)) { + throw new IllegalArgumentException(extensionName + + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " + + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " + + "no annotation, but was: " + rawPolicy); + } + return normalized; + } + + /** + * Validate and normalize the {@code optionalNonNullPropertyJsonInclude} config option value. + * + * @param policy the raw config option value (may be {@code null}, in which case the default + * {@code NON_NULL} is returned) + * @param optionName the config option name, used in the error message (kept generator-agnostic) + * @return the normalized (upper-case) policy: one of {@code NON_NULL}, {@code NON_EMPTY}, + * {@code NON_DEFAULT}, {@code NONE}. + * @throws IllegalArgumentException when the value is not one of the supported policies. + */ + public static String normalizeJsonIncludePolicy(String policy, String optionName) { + if (policy == null) { + return "NON_NULL"; + } + String normalized = policy.trim().toUpperCase(Locale.ROOT); + if (!VALID_OPTIONAL_NON_NULL_POLICIES.contains(normalized)) { + throw new IllegalArgumentException(optionName + + " must be one of NON_NULL, NON_EMPTY, NON_DEFAULT, NONE but was: " + policy); + } + return normalized; + } +} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 7996c876d2b1..aad6f17f5418 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -8566,6 +8566,26 @@ void jsonInclude_manualOverride_none_emitsNoAnnotationOrImport() throws IOExcept .doesNotContainWithName("JsonInclude"); } + /** + * Issue #24401: a whitespace-padded {@code NONE} override must be treated identically to a bare + * {@code NONE} — the sentinel comparison must trim before checking, otherwise it falls through to + * validation and generation fails for a value that should simply suppress the annotation. + */ + @Test + void jsonInclude_manualOverride_paddedNone_emitsNoAnnotationOrImport() throws IOException { + final String jsonInclude = "com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + + JavaFileAssert.assertThat(files.get("ManualNonePadded.java")) + .hasNoImports(jsonInclude) + .assertProperty("value").assertPropertyAnnotations() + .doesNotContainWithName("JsonInclude"); + } + /** * Issue #24401: an invalid manual per-property override must fail fast with an actionable error * during generation rather than emitting uncompilable Java. 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 d2064c192bca..e869c1c41a90 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 @@ -6900,6 +6900,25 @@ public void jsonInclude_manualOverride_none_emitsNoAnnotationOrImport() throws I "manual NONE override must emit no @field:JsonInclude annotation"); } + /** + * Issue #24401: a whitespace-padded {@code NONE} override must be treated identically to a bare + * {@code NONE} — the sentinel comparison must trim before checking, otherwise it falls through to + * validation and generation fails for a value that should simply suppress the annotation. + */ + @Test(description = "Issue #24401 – padded NONE override emits no annotation or import (kotlin-spring)") + public void jsonInclude_manualOverride_paddedNone_emitsNoAnnotationOrImport() throws IOException { + final String jsonInclude = "import com.fasterxml.jackson.annotation.JsonInclude"; + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + + Path manualNonePadded = files.get("ManualNonePadded.kt").toPath(); + assertFileNotContains(manualNonePadded, jsonInclude); + Assert.assertFalse(Files.readString(manualNonePadded).contains("@field:JsonInclude"), + "padded NONE override must emit no @field:JsonInclude annotation"); + } + /** * Issue #24401: an invalid manual per-property override must fail fast with an actionable error * during generation rather than emitting uncompilable Kotlin. diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml new file mode 100644 index 000000000000..39d6b3ed12eb --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml @@ -0,0 +1,28 @@ +openapi: 3.0.0 +info: + title: JsonInclude invalid manual override test + version: 1.0.0 + description: > + A single schema whose property carries an invalid x-jackson-json-include-policy value. + Generation must fail fast with an actionable error rather than emitting uncompilable output. +paths: + /test: + post: + operationId: testPost + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/InvalidOverride' + responses: + '200': + description: OK +components: + schemas: + InvalidOverride: + type: object + properties: + value: + type: string + nullable: false + x-jackson-json-include-policy: NOT_A_REAL_POLICY diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml index 1799586edce7..5e10c8cf438e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml @@ -88,3 +88,12 @@ components: type: string nullable: false x-jackson-json-include-policy: NONE + # manual per-property override of NONE padded with whitespace: must be treated identically to a + # bare NONE (normalization must trim before comparing), i.e. emit no annotation, no validation error. + ManualNonePadded: + type: object + properties: + value: + type: string + nullable: false + x-jackson-json-include-policy: " NONE " From 1bc5c1d82fe26f3d6b69c28930927ed7a553c901 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 16:51:53 +0200 Subject: [PATCH 10/20] feat(json-include): update JSON include policy constants to use VendorExtension and CodegenConstants --- .../java/org/openapitools/codegen/CodegenConstants.java | 9 +++++++++ .../java/org/openapitools/codegen/VendorExtension.java | 3 ++- .../codegen/languages/KotlinSpringServerCodegen.java | 9 +++++---- .../openapitools/codegen/languages/SpringCodegen.java | 9 +++++---- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index ad507e2ff370..de86737a238b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -415,6 +415,15 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, public static final String USE_VERTX_5 = "useVertx5"; public static final String USE_VERTX_5_DESC = "Setting this property to true will generate Vert.x 5 specific callbacks using Callables."; + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC = "The Jackson @JsonInclude policy to apply to optional, non-nullable properties (ignored unless generateJsonIncludeAnnotations is true)."; + + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC = "Generate field-level @JsonInclude annotations controlling Jackson serialization inclusion. When unset or false, no @JsonInclude annotations are generated and the project-wide ObjectMapper policy applies."; + + public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = "generateJsonSetterNullsAnnotations"; + public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS_DESC = "Generate field-level @JsonSetter(nulls = ...) annotations controlling Jackson deserialization null-handling for optional, non-nullable properties. When unset or false, no @JsonSetter annotations are generated and the project-wide ObjectMapper policy applies."; + public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT = "disallowAdditionalPropertiesIfNotPresent"; public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC = "If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. " + diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java index 288ca9d0fb99..638bbe62b2fd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java @@ -31,7 +31,8 @@ public enum VendorExtension { X_SIZE_MESSAGE("x-size-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the size or length of a variable", null), X_MINIMUM_MESSAGE("x-minimum-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the minimum value of a variable", null), X_MAXIMUM_MESSAGE("x-maximum-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the maximum value of a variable", null), - X_ZERO_BASED_ENUM("x-zero-based-enum", ExtensionLevel.MODEL, "When used on an enum, the index will not be generated and the default numbering will be used, zero-based", "false"); + X_ZERO_BASED_ENUM("x-zero-based-enum", ExtensionLevel.MODEL, "When used on an enum, the index will not be generated and the default numbering will be used, zero-based", "false"), + X_JACKSON_JSON_INCLUDE_POLICY("x-jackson-json-include-policy", ExtensionLevel.FIELD, "Manually override the resolved Jackson `@JsonInclude` policy for this property. Must be one of `ALWAYS`, `NON_NULL`, `NON_ABSENT`, `NON_EMPTY`, `NON_DEFAULT`, `USE_DEFAULTS`, `CUSTOM`, or `NONE` to emit no annotation. Always wins over the automatic required/nullable matrix and the `optionalNonNullPropertyJsonInclude` option.", "resolved automatically per the required/nullable matrix"); private final String name; private final List levels; 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 38b37de1befc..1345b3c6e952 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 @@ -112,15 +112,15 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String USE_SEALED_RESPONSE_INTERFACES = "useSealedResponseInterfaces"; public static final String COMPANION_OBJECT = "companionObject"; public static final String SUSPEND_FUNCTIONS = "suspendFunctions"; - public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; - public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; - public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = "generateJsonSetterNullsAnnotations"; + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE; + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS; + public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS; /** * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. * A value set directly in the spec is treated as a manual override and always wins. */ - public static final String JSON_INCLUDE_POLICY_EXTENSION = "x-jackson-json-include-policy"; + public static final String JSON_INCLUDE_POLICY_EXTENSION = VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(); @Getter public enum DeclarativeInterfaceReactiveMode { @@ -1901,6 +1901,7 @@ public List getSupportedVendorExtensions() { extensions.add(VendorExtension.X_KOTLIN_IMPLEMENTS); extensions.add(VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS); extensions.add(VendorExtension.X_SPRING_PAGINATED); + extensions.add(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY); return extensions; } 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 b48d0d43c5d5..40dc160c3f6d 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 @@ -124,15 +124,15 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String GENERATE_PAGEABLE_CONSTRAINT_VALIDATION = "generatePageableConstraintValidation"; public static final String SUBSTITUTE_GENERIC_PAGED_MODEL = "substituteGenericPagedModel"; public static final String CLIENT_REGISTRATION_ID = "clientRegistrationId"; - public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; - public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; - public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = "generateJsonSetterNullsAnnotations"; + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE; + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS; + public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS; /** * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. * A value set directly in the spec is treated as a manual override and always wins. */ - public static final String JSON_INCLUDE_POLICY_EXTENSION = "x-jackson-json-include-policy"; + public static final String JSON_INCLUDE_POLICY_EXTENSION = VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(); @Getter public enum RequestMappingMode { @@ -1655,6 +1655,7 @@ public List getSupportedVendorExtensions() { extensions.add(VendorExtension.X_MINIMUM_MESSAGE); extensions.add(VendorExtension.X_MAXIMUM_MESSAGE); extensions.add(VendorExtension.X_SPRING_API_VERSION); + extensions.add(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY); return extensions; } From 41a29cd1232aa469e282cb3aa69448423bfc72f7 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 17:12:53 +0200 Subject: [PATCH 11/20] refactor(json-include): replace constants with CodegenConstants in JSON include policy handling --- .../languages/KotlinSpringServerCodegen.java | 57 ++++++++----------- .../codegen/languages/SpringCodegen.java | 49 +++++++--------- .../java/spring/SpringCodegenTest.java | 30 +++++----- .../spring/KotlinSpringServerCodegenTest.java | 38 ++++++------- 4 files changed, 78 insertions(+), 96 deletions(-) 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 1345b3c6e952..a895b420cf04 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 @@ -112,15 +112,6 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String USE_SEALED_RESPONSE_INTERFACES = "useSealedResponseInterfaces"; public static final String COMPANION_OBJECT = "companionObject"; public static final String SUSPEND_FUNCTIONS = "suspendFunctions"; - public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE; - public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS; - public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS; - /** - * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy - * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. - * A value set directly in the spec is treated as a manual override and always wins. - */ - public static final String JSON_INCLUDE_POLICY_EXTENSION = VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(); @Getter public enum DeclarativeInterfaceReactiveMode { @@ -329,9 +320,9 @@ public KotlinSpringServerCodegen() { addSwitch(COMPANION_OBJECT, "Whether to generate companion objects in data classes, enabling companion extensions.", companionObject); addSwitch(SUSPEND_FUNCTIONS, "Whether to generate suspend functions for API operations. Useful for Spring MVC with Kotlin coroutines without requiring the full reactive stack.", suspendFunctions); - CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, + CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " - + GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); @@ -340,14 +331,14 @@ public KotlinSpringServerCodegen() { optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude); cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); - addSwitch(GENERATE_JSON_INCLUDE_ANNOTATIONS, + addSwitch(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " + "spec-honest annotations (required-field protection and the optional non-nullable policy from " - + OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.", false); - addSwitch(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + addSwitch(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + "When true, emits @JsonSetter (Nulls.FAIL when openApiNullable is true, otherwise Nulls.SKIP) so " + "an explicit null in the payload is handled explicitly. When false, none are generated and " @@ -772,36 +763,36 @@ public void processOpts() { } writePropertyBack(SUSPEND_FUNCTIONS, suspendFunctions); - if (additionalProperties.containsKey(GENERATE_JSON_INCLUDE_ANNOTATIONS)) { - this.setGenerateJsonIncludeAnnotations(convertPropertyToBoolean(GENERATE_JSON_INCLUDE_ANNOTATIONS)); + if (additionalProperties.containsKey(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS)) { + this.setGenerateJsonIncludeAnnotations(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS)); } - writePropertyBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, Boolean.TRUE.equals(generateJsonIncludeAnnotations)); - if (additionalProperties.containsKey(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)) { - this.setGenerateJsonSetterNullsAnnotations(convertPropertyToBoolean(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)); + writePropertyBack(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, Boolean.TRUE.equals(generateJsonIncludeAnnotations)); + if (additionalProperties.containsKey(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)) { + this.setGenerateJsonSetterNullsAnnotations(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)); } - writePropertyBack(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, Boolean.TRUE.equals(generateJsonSetterNullsAnnotations)); - if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { - this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); + writePropertyBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, Boolean.TRUE.equals(generateJsonSetterNullsAnnotations)); + if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { + this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); } this.optionalNonNullPropertyJsonInclude = JsonIncludePolicyUtils.normalizeJsonIncludePolicy( - this.optionalNonNullPropertyJsonInclude, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); - writePropertyBack(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); + this.optionalNonNullPropertyJsonInclude, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + writePropertyBack(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); if (generateJsonIncludeAnnotations == null) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " + "@JsonInclude, so leaving this unset preserves that behavior.", - GENERATE_JSON_INCLUDE_ANNOTATIONS, GENERATE_JSON_INCLUDE_ANNOTATIONS, - GENERATE_JSON_INCLUDE_ANNOTATIONS, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); } if (generateJsonSetterNullsAnnotations == null) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " + "@JsonSetter(nulls = ...) on optional non-nullable fields.", - GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, - GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); } if (additionalProperties.containsKey(BEAN_QUALIFIERS) && library.equals(SPRING_BOOT)) { @@ -1410,15 +1401,15 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert * */ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property) { - if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { + if (property.vendorExtensions.containsKey(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName())) { String manualPolicy = JsonIncludePolicyUtils.resolveManualJsonIncludePolicy( - property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION), JSON_INCLUDE_POLICY_EXTENSION); + property.vendorExtensions.get(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()), VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); if (manualPolicy != null) { - property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, manualPolicy); + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), manualPolicy); model.imports.add("JsonInclude"); } else { // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. - property.vendorExtensions.remove(JSON_INCLUDE_POLICY_EXTENSION); + property.vendorExtensions.remove(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); } return; } @@ -1432,7 +1423,7 @@ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty proper policy = optionalNonNullPropertyJsonInclude; } if (JsonIncludePolicyUtils.isJsonIncludePolicyEmitted(policy)) { - property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, policy); + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy); model.imports.add("JsonInclude"); } } 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 40dc160c3f6d..9ed49f55c9f9 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 @@ -124,15 +124,6 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String GENERATE_PAGEABLE_CONSTRAINT_VALIDATION = "generatePageableConstraintValidation"; public static final String SUBSTITUTE_GENERIC_PAGED_MODEL = "substituteGenericPagedModel"; public static final String CLIENT_REGISTRATION_ID = "clientRegistrationId"; - public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE; - public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS; - public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS; - /** - * Universal per-property vendor extension holding the resolved Jackson {@code @JsonInclude} policy - * (e.g. {@code NON_NULL}, {@code ALWAYS}). When absent, no {@code @JsonInclude} annotation is emitted. - * A value set directly in the spec is treated as a manual override and always wins. - */ - public static final String JSON_INCLUDE_POLICY_EXTENSION = VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(); @Getter public enum RequestMappingMode { @@ -299,9 +290,9 @@ public SpringCodegen() { cliOptions.add(CliOption.newBoolean(USE_SEALED, "Whether to generate sealed model interfaces and classes")); - CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, + CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " - + GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); @@ -310,14 +301,14 @@ public SpringCodegen() { optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude); cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); - cliOptions.add(CliOption.newBoolean(GENERATE_JSON_INCLUDE_ANNOTATIONS, + cliOptions.add(CliOption.newBoolean(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " + "spec-honest annotations (required-field protection and the optional non-nullable policy from " - + OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.", false)); - cliOptions.add(CliOption.newBoolean(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + cliOptions.add(CliOption.newBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + "When true, emits @JsonSetter so an explicit null in the payload does not overwrite the field. " + "When false, none are generated and deserialization null-handling defers to the global ObjectMapper. " @@ -597,14 +588,14 @@ public void processOpts() { convertPropertyToBooleanAndWriteBack(RETURN_SUCCESS_CODE, this::setReturnSuccessCode); convertPropertyToBooleanAndWriteBack(USE_SWAGGER_UI, this::setUseSwaggerUI); convertPropertyToBooleanAndWriteBack(USE_SEALED, this::setUseSealed); - convertPropertyToBooleanAndWriteBack(GENERATE_JSON_INCLUDE_ANNOTATIONS, this::setGenerateJsonIncludeAnnotations); - convertPropertyToBooleanAndWriteBack(GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, this::setGenerateJsonSetterNullsAnnotations); - if (additionalProperties.containsKey(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { - this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); + convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, this::setGenerateJsonIncludeAnnotations); + convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, this::setGenerateJsonSetterNullsAnnotations); + if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { + this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); } this.optionalNonNullPropertyJsonInclude = JsonIncludePolicyUtils.normalizeJsonIncludePolicy( - this.optionalNonNullPropertyJsonInclude, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); - additionalProperties.put(OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); + this.optionalNonNullPropertyJsonInclude, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + additionalProperties.put(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); if (jackson) { if (generateJsonIncludeAnnotations == null) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " @@ -612,16 +603,16 @@ public void processOpts() { + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " + "@JsonInclude, so leaving this unset preserves that behavior.", - GENERATE_JSON_INCLUDE_ANNOTATIONS, GENERATE_JSON_INCLUDE_ANNOTATIONS, - GENERATE_JSON_INCLUDE_ANNOTATIONS, OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); } if (generateJsonSetterNullsAnnotations == null) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " + "@JsonSetter(nulls = ...) on optional non-nullable fields.", - GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, - GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); } } if (DocumentationProvider.NONE.equals(getDocumentationProvider())) { @@ -1296,15 +1287,15 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // required & nullable -> ALWAYS (explicit null is valid and must be serialized) // optional & non-nullable -> optionalNonNullPropertyJsonInclude (default NON_NULL, NONE = omit) // optional & nullable -> none (JsonNullable module already governs inclusion) - if (property.vendorExtensions.containsKey(JSON_INCLUDE_POLICY_EXTENSION)) { + if (property.vendorExtensions.containsKey(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName())) { String manualPolicy = JsonIncludePolicyUtils.resolveManualJsonIncludePolicy( - property.vendorExtensions.get(JSON_INCLUDE_POLICY_EXTENSION), JSON_INCLUDE_POLICY_EXTENSION); + property.vendorExtensions.get(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()), VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); if (manualPolicy != null) { - property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, manualPolicy); + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), manualPolicy); model.imports.add("JsonInclude"); } else { // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. - property.vendorExtensions.remove(JSON_INCLUDE_POLICY_EXTENSION); + property.vendorExtensions.remove(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); } } else if (Boolean.TRUE.equals(generateJsonIncludeAnnotations)) { String policy = null; @@ -1314,7 +1305,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert policy = optionalNonNullPropertyJsonInclude; } if (JsonIncludePolicyUtils.isJsonIncludePolicyEmitted(policy)) { - property.vendorExtensions.put(JSON_INCLUDE_POLICY_EXTENSION, policy); + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy); model.imports.add("JsonInclude"); } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index aad6f17f5418..1e314a89f7a4 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -8339,7 +8339,7 @@ void jsonInclude_defaultMatrix() throws IOException { "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); JavaFileAssert.assertThat(files.get("TestModel.java")) .assertProperty("requiredNonNullable").assertPropertyAnnotations() @@ -8363,7 +8363,7 @@ void jsonSetterNulls_generateFlag_controlsEmission() throws IOException { "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "false", - SpringCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); assertFileContains(withFlag.get("OptionalNonNullable.java").toPath(), "@JsonSetter(nulls = Nulls.SKIP)"); Map unset = generateFromContract( @@ -8383,8 +8383,8 @@ void jsonInclude_optionalNonNullPolicy_nonEmpty() throws IOException { "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - SpringCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NON_EMPTY")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NON_EMPTY")); JavaFileAssert.assertThat(files.get("TestModel.java")) .assertProperty("optionalNonNullable").assertPropertyAnnotations() @@ -8404,8 +8404,8 @@ void jsonInclude_optionalNonNullPolicy_none() throws IOException { "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - SpringCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); JavaFileAssert.assertThat(files.get("TestModel.java")) .assertProperty("optionalNonNullable").assertPropertyAnnotations() @@ -8424,7 +8424,7 @@ void jsonInclude_generateJsonIncludeAnnotations_false() throws IOException { "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); Path modelFile = files.get("TestModel.java").toPath(); assertFileNotContains(modelFile, "@JsonInclude("); @@ -8439,7 +8439,7 @@ void jsonInclude_manualOverride_winsOverGenerateFlag() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_override.yaml", SPRING_BOOT, - Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); JavaFileAssert.assertThat(files.get("TestModel.java")) .assertProperty("overridden").assertPropertyAnnotations() @@ -8464,7 +8464,7 @@ void jsonInclude_perSchemaImports() throws IOException { "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); // required non-nullable -> @JsonInclude(NON_NULL); no setter machinery JavaFileAssert.assertThat(files.get("RequiredNonNullable.java")) @@ -8495,8 +8495,8 @@ void jsonInclude_perSchemaImports_withoutOpenApiNullable() throws IOException { "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, Map.of(CodegenConstants.OPENAPI_NULLABLE, "false", - SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - SpringCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); // optional non-nullable -> @JsonInclude(NON_NULL) + @JsonSetter(Nulls.SKIP) JavaFileAssert.assertThat(files.get("OptionalNonNullable.java")) @@ -8517,7 +8517,7 @@ void jsonInclude_manualOverride_emitsImport_whenAnnotationsDisabled() throws IOE Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, - Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); JavaFileAssert.assertThat(files.get("ManualOverride.java")) .hasImports(jsonInclude) @@ -8558,7 +8558,7 @@ void jsonInclude_manualOverride_none_emitsNoAnnotationOrImport() throws IOExcept Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, - Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); JavaFileAssert.assertThat(files.get("ManualNone.java")) .hasNoImports(jsonInclude) @@ -8578,7 +8578,7 @@ void jsonInclude_manualOverride_paddedNone_emitsNoAnnotationOrImport() throws IO Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", SPRING_BOOT, - Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); JavaFileAssert.assertThat(files.get("ManualNonePadded.java")) .hasNoImports(jsonInclude) @@ -8595,7 +8595,7 @@ void jsonInclude_manualOverride_invalid_failsWithActionableError() { org.assertj.core.api.Assertions.assertThatThrownBy(() -> generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml", SPRING_BOOT, - Map.of(SpringCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true"))) + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true"))) .hasStackTraceContaining("x-jackson-json-include-policy") .hasStackTraceContaining("NOT_A_REAL_POLICY"); } 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 e869c1c41a90..e96f9a00f8d3 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 @@ -6540,8 +6540,8 @@ public void requiredNullable_scenario2_requiredNullable() throws IOException { public void requiredNullable_scenario3_optionalNonNullable() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); Path modelFile = files.get("TestModel.kt").toPath(); String content = Files.readString(modelFile); @@ -6572,8 +6572,8 @@ public void requiredNullable_scenario3_optionalNonNullable_withOpenApiNullable() Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); Path modelFile = files.get("TestModel.kt").toPath(); String content = Files.readString(modelFile); @@ -6601,8 +6601,8 @@ public void requiredNullable_scenario3_optionalNonNullable_withOpenApiNullable() public void requiredNullable_scenario3_optionalNonNullable_withDefault() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); Path modelFile = files.get("TestModel.kt").toPath(); String content = Files.readString(modelFile); @@ -6678,7 +6678,7 @@ public void requiredNullable_scenario3_optionalNonNullable_withJackson3() throws Map props = new HashMap<>(); props.put(KotlinSpringServerCodegen.USE_SPRING_BOOT4, "true"); props.put(CodegenConstants.OPENAPI_NULLABLE, "true"); - props.put(KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); + props.put(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", props); @@ -6734,7 +6734,7 @@ public void jsonInclude_unset_emitsNoPolicyAnnotations() throws IOException { public void jsonInclude_kotlinMatrix_default() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); String content = Files.readString(files.get("TestModel.kt").toPath()); Assert.assertTrue(jsonIncludeBlockFor(content, "requiredNonNullable").contains("@field:JsonInclude(JsonInclude.Include.ALWAYS)"), @@ -6755,8 +6755,8 @@ public void jsonInclude_kotlinMatrix_default() throws IOException { public void jsonInclude_optionalNonNullPolicy_none() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - KotlinSpringServerCodegen.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, "NONE")); String content = Files.readString(files.get("TestModel.kt").toPath()); Assert.assertFalse(jsonIncludeBlockFor(content, "optionalNonNullable").contains("@field:JsonInclude"), @@ -6773,7 +6773,7 @@ public void jsonInclude_optionalNonNullPolicy_none() throws IOException { public void jsonInclude_generateJsonIncludeAnnotations_false() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/required-nullable-4-states.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); assertFileNotContains(files.get("TestModel.kt").toPath(), "@field:JsonInclude("); } @@ -6786,7 +6786,7 @@ public void jsonInclude_generateJsonIncludeAnnotations_false() throws IOExceptio public void jsonInclude_manualOverride_winsOverGenerateFlag() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_override.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); String content = Files.readString(files.get("TestModel.kt").toPath()); Assert.assertTrue(jsonIncludeBlockFor(content, "overridden").contains("@field:JsonInclude(JsonInclude.Include.NON_EMPTY)"), @@ -6820,8 +6820,8 @@ public void jsonInclude_perSchemaImports() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", Map.of(CodegenConstants.OPENAPI_NULLABLE, "true", - KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", - KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true", + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true")); // required non-nullable -> @field:JsonInclude(ALWAYS); no setter/nullable machinery Path requiredNonNullable = files.get("RequiredNonNullable.kt").toPath(); @@ -6851,7 +6851,7 @@ public void jsonInclude_manualOverride_emitsImport_whenAnnotationsDisabled() thr Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "false")); Path manualOverride = files.get("ManualOverride.kt").toPath(); assertFileContains(manualOverride, jsonInclude); @@ -6892,7 +6892,7 @@ public void jsonInclude_manualOverride_none_emitsNoAnnotationOrImport() throws I Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); Path manualNone = files.get("ManualNone.kt").toPath(); assertFileNotContains(manualNone, jsonInclude); @@ -6911,7 +6911,7 @@ public void jsonInclude_manualOverride_paddedNone_emitsNoAnnotationOrImport() th Map files = generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true")); Path manualNonePadded = files.get("ManualNonePadded.kt").toPath(); assertFileNotContains(manualNonePadded, jsonInclude); @@ -6927,7 +6927,7 @@ public void jsonInclude_manualOverride_paddedNone_emitsNoAnnotationOrImport() th public void jsonInclude_manualOverride_invalid_failsWithActionableError() { Throwable thrown = Assert.expectThrows(Throwable.class, () -> generateFromContract( "src/test/resources/3_0/spring/issue_24401_json_include_invalid_override.yaml", - Map.of(KotlinSpringServerCodegen.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true"))); + Map.of(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, "true"))); java.io.StringWriter sw = new java.io.StringWriter(); thrown.printStackTrace(new java.io.PrintWriter(sw)); @@ -7220,7 +7220,7 @@ public void testIssue24139NullableRefNoJsonSetterNullsFail() throws IOException Map additionalProperties = new HashMap<>(); additionalProperties.put("useBeanValidation", true); additionalProperties.put("openApiNullable", "true"); - additionalProperties.put(KotlinSpringServerCodegen.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); + additionalProperties.put(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); Map files = generateFromContract( "src/test/resources/3_1/issue_24139.yaml", From 3dbcd998eca705941903ce01ff4df6dba95765a1 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 17:43:18 +0200 Subject: [PATCH 12/20] feat(json-include): add @JsonSetter(nulls = Nulls.SKIP) for fields with Lombok setters --- .../main/resources/JavaSpring/pojo.mustache | 8 +++---- .../java/spring/SpringCodegenTest.java | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index bfd4acbfc98b..b7f28efc82e9 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -65,6 +65,9 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{#vendorExtensions.x-jackson-json-include-policy}} @JsonInclude(JsonInclude.Include.{{{vendorExtensions.x-jackson-json-include-policy}}}) {{/vendorExtensions.x-jackson-json-include-policy}} + {{#vendorExtensions.x-has-json-setter-nulls-skip}} + @JsonSetter(nulls = Nulls.SKIP) + {{/vendorExtensions.x-has-json-setter-nulls-skip}} {{/jackson}} {{#deprecated}} @Deprecated @@ -247,11 +250,6 @@ 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/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 1e314a89f7a4..42ea848788da 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -8373,6 +8373,29 @@ void jsonSetterNulls_generateFlag_controlsEmission() throws IOException { assertFileNotContains(unset.get("OptionalNonNullable.java").toPath(), "@JsonSetter("); } + /** + * Issue #24401 regression: when Lombok generates the setter ({@code lombok.Setter}), the manual + * setter method (and the {@code @JsonSetter} annotation that used to live only on it) is skipped + * entirely. {@code @JsonSetter(nulls = Nulls.SKIP)} must be emitted on the field itself so it is + * still honored by Jackson even though no explicit setter method is generated. + */ + @Test + void jsonSetterNulls_generateFlag_appliesWithLombokSetter() throws IOException { + Map additionalProperties = new HashMap<>(); + additionalProperties.put(CodegenConstants.OPENAPI_NULLABLE, "false"); + additionalProperties.put(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "true"); + additionalProperties.put(AbstractJavaCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, "@lombok.Getter;@lombok.Setter"); + + Map files = generateFromContract( + "src/test/resources/3_0/spring/issue_24401_json_include_per_schema.yaml", + SPRING_BOOT, + additionalProperties); + + JavaFileAssert.assertThat(files.get("OptionalNonNullable.java")) + .hasNoMethod("setOptionalNonNullable"); + assertFileContains(files.get("OptionalNonNullable.java").toPath(), "@JsonSetter(nulls = Nulls.SKIP)"); + } + /** * Issue #24401: {@code optionalNonNullPropertyJsonInclude} changes the policy emitted for * optional non-nullable properties (when {@code generateJsonIncludeAnnotations=true}). From 58a2d968a3552652953621333d3a147a57cf1b18 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Fri, 24 Jul 2026 17:59:01 +0200 Subject: [PATCH 13/20] feat(json-include): add options for generating @JsonInclude and @JsonSetter annotations --- docs/generators/java-camel.md | 4 ++++ docs/generators/kotlin-spring.md | 4 ++++ docs/generators/spring.md | 4 ++++ docs/migration-guide.adoc | 5 +++++ 4 files changed, 17 insertions(+) diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 2e2d5191f02f..8e58d56d5696 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -64,6 +64,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBuilders|Whether to generate builders for models| |false| |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false| |generateGenericResponseEntity|Use a generic type for the `ResponseEntity` wrapping return values of generated API methods. If enabled, method are generated with return type ResponseEntity<?>| |false| +|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When true, emits spec-honest annotations (required-field protection and the optional non-nullable policy from optionalNonNullPropertyJsonInclude). When false, none are generated and the global ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning. A per-property override set via the `x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.| |false| +|generateJsonSetterNullsAnnotations|Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. When true, emits @JsonSetter so an explicit null in the payload does not overwrite the field. When false, none are generated and deserialization null-handling defers to the global ObjectMapper. When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning.| |false| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| @@ -83,6 +85,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelPackage|package for generated models| |org.openapitools.model| |openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true| |optionalAcceptNullable|Use `ofNullable` instead of just `of` to accept null values when using Optional.| |true| +|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when generateJsonIncludeAnnotations is true. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| @@ -153,6 +156,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |x-minimum-message|Add this property whenever you need to customize the invalidation error message for the minimum value of a variable|FIELD, OPERATION_PARAMETER|null |x-maximum-message|Add this property whenever you need to customize the invalidation error message for the maximum value of a variable|FIELD, OPERATION_PARAMETER|null |x-spring-api-version|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).|OPERATION|null +|x-jackson-json-include-policy|Manually override the resolved Jackson `@JsonInclude` policy for this property. Must be one of `ALWAYS`, `NON_NULL`, `NON_ABSENT`, `NON_EMPTY`, `NON_DEFAULT`, `USE_DEFAULTS`, `CUSTOM`, or `NONE` to emit no annotation. Always wins over the automatic required/nullable matrix and the `optionalNonNullPropertyJsonInclude` option.|FIELD|resolved automatically per the required/nullable matrix ## IMPORT MAPPING diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index f42388d53000..e821e8b34cf0 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -33,6 +33,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**source**
Publish the original input OpenAPI specification.
**springdoc**
Generate an OpenAPI 3 specification using SpringDoc.
|springdoc| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original| |exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true| +|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When true, emits spec-honest annotations (required-field protection and the optional non-nullable policy from optionalNonNullPropertyJsonInclude). When false, none are generated and the global ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning. A per-property override set via the `x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.| |false| +|generateJsonSetterNullsAnnotations|Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. When true, emits @JsonSetter (Nulls.FAIL when openApiNullable is true, otherwise Nulls.SKIP) so an explicit null in the payload is handled explicitly. When false, none are generated and deserialization null-handling defers to the global ObjectMapper. When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning.| |false| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |gradleBuildFile|generate a gradle build file using the Kotlin DSL| |true| @@ -44,6 +46,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelMutable|Create mutable models| |false| |modelPackage|model package for generated code| |org.openapitools.model| |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| +|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when generateJsonIncludeAnnotations is true. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |packageName|Generated artifact package name.| |org.openapitools| |parcelizeModels|toggle "@Parcelize" for generated models| |null| |reactive|use coroutines for reactive behavior| |false| @@ -94,6 +97,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |x-kotlin-implements|Ability to specify interfaces that model must implement|MODEL|empty array |x-kotlin-implements-fields|Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`|MODEL|empty array |x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object. Only applies when `library=spring-boot`; ignored for client libraries (spring-cloud, spring-declarative-http-interface).|OPERATION|false +|x-jackson-json-include-policy|Manually override the resolved Jackson `@JsonInclude` policy for this property. Must be one of `ALWAYS`, `NON_NULL`, `NON_ABSENT`, `NON_EMPTY`, `NON_DEFAULT`, `USE_DEFAULTS`, `CUSTOM`, or `NONE` to emit no annotation. Always wins over the automatic required/nullable matrix and the `optionalNonNullPropertyJsonInclude` option.|FIELD|resolved automatically per the required/nullable matrix ## IMPORT MAPPING diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 31f5f55ff4a5..f03b4183ef93 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -57,6 +57,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateBuilders|Whether to generate builders for models| |false| |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false| |generateGenericResponseEntity|Use a generic type for the `ResponseEntity` wrapping return values of generated API methods. If enabled, method are generated with return type ResponseEntity<?>| |false| +|generateJsonIncludeAnnotations|Whether to generate policy @JsonInclude annotations on model properties. When true, emits spec-honest annotations (required-field protection and the optional non-nullable policy from optionalNonNullPropertyJsonInclude). When false, none are generated and the global ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning. A per-property override set via the `x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.| |false| +|generateJsonSetterNullsAnnotations|Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. When true, emits @JsonSetter so an explicit null in the payload does not overwrite the field. When false, none are generated and deserialization null-handling defers to the global ObjectMapper. When left unset it defaults to false (7.23.0-equivalent output) and logs a warning; set it explicitly to silence the warning.| |false| |generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false| |generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false| |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| @@ -76,6 +78,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |modelPackage|package for generated models| |org.openapitools.model| |openApiNullable|Enable OpenAPI Jackson Nullable library. Not supported by `microprofile` library.| |true| |optionalAcceptNullable|Use `ofNullable` instead of just `of` to accept null values when using Optional.| |true| +|optionalNonNullPropertyJsonInclude|The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when generateJsonIncludeAnnotations is true. NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy.|
**NON_NULL**
Omit the property when its value is null (default, spec-safe for non-nullable fields).
**NON_EMPTY**
Omit the property when its value is null or considered empty.
**NON_DEFAULT**
Omit the property when its value equals the default.
**NONE**
Emit no @JsonInclude annotation; defer to the global ObjectMapper.
|NON_NULL| |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null| @@ -146,6 +149,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |x-minimum-message|Add this property whenever you need to customize the invalidation error message for the minimum value of a variable|FIELD, OPERATION_PARAMETER|null |x-maximum-message|Add this property whenever you need to customize the invalidation error message for the maximum value of a variable|FIELD, OPERATION_PARAMETER|null |x-spring-api-version|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).|OPERATION|null +|x-jackson-json-include-policy|Manually override the resolved Jackson `@JsonInclude` policy for this property. Must be one of `ALWAYS`, `NON_NULL`, `NON_ABSENT`, `NON_EMPTY`, `NON_DEFAULT`, `USE_DEFAULTS`, `CUSTOM`, or `NONE` to emit no annotation. Always wins over the automatic required/nullable matrix and the `optionalNonNullPropertyJsonInclude` option.|FIELD|resolved automatically per the required/nullable matrix ## IMPORT MAPPING diff --git a/docs/migration-guide.adoc b/docs/migration-guide.adoc index d8cde8b16713..9664005dd6a2 100644 --- a/docs/migration-guide.adoc +++ b/docs/migration-guide.adoc @@ -39,6 +39,11 @@ A per-property override set via the `x-jackson-json-include-policy` vendor exten ** `false` → same weak behavior, warning silenced. ** `true` → emit `@JsonSetter(nulls = ...)` on optional non-nullable properties. +[NOTE] +==== +This also affects the `kotlin-spring` strict-null (PATCH) behavior. In `7.24.x`, an optional non-nullable property generated with `openApiNullable=true` emitted `@JsonSetter(nulls = Nulls.FAIL)`, so an explicit `null` in the payload was rejected. From `7.25.0`, that annotation is only emitted when `generateJsonSetterNullsAnnotations=true`. Leaving the option unset (or `false`) means an explicit `null` is handled by the global `ObjectMapper` instead of failing. Set `generateJsonSetterNullsAnnotations=true` to restore the strict `Nulls.FAIL` behavior. +==== + ==== Note `@JsonInclude(NON_ABSENT)` is no longer emitted on `JsonNullable` fields: the `JsonNullable` module already governs their inclusion, so the annotation was redundant. From ccfea9c038b4021c6133e4f495433932dd637196 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Wed, 29 Jul 2026 17:11:26 +0200 Subject: [PATCH 14/20] feat(json-include): introduce JsonIncludePolicy and TriStateBoolean for improved JSON annotation handling --- .../codegen/CodegenConstants.java | 3 - .../languages/KotlinSpringServerCodegen.java | 63 +++++++-------- .../codegen/languages/SpringCodegen.java | 59 +++++++------- .../codegen/utils/JsonIncludePolicy.java | 80 +++++++++++++++++++ .../codegen/utils/JsonIncludePolicyUtils.java | 77 ++++++++---------- .../codegen/utils/TriStateBoolean.java | 44 ++++++++++ 6 files changed, 213 insertions(+), 113 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicy.java create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index de86737a238b..443acd45962d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -416,13 +416,10 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, public static final String USE_VERTX_5_DESC = "Setting this property to true will generate Vert.x 5 specific callbacks using Callables."; public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE = "optionalNonNullPropertyJsonInclude"; - public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC = "The Jackson @JsonInclude policy to apply to optional, non-nullable properties (ignored unless generateJsonIncludeAnnotations is true)."; public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS = "generateJsonIncludeAnnotations"; - public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC = "Generate field-level @JsonInclude annotations controlling Jackson serialization inclusion. When unset or false, no @JsonInclude annotations are generated and the project-wide ObjectMapper policy applies."; public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS = "generateJsonSetterNullsAnnotations"; - public static final String GENERATE_JSON_SETTER_NULLS_ANNOTATIONS_DESC = "Generate field-level @JsonSetter(nulls = ...) annotations controlling Jackson deserialization null-handling for optional, non-nullable properties. When unset or false, no @JsonSetter annotations are generated and the project-wide ObjectMapper policy applies."; public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT = "disallowAdditionalPropertiesIfNotPresent"; public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC = 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 a895b420cf04..925dce43afee 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 @@ -34,8 +34,10 @@ import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; +import org.openapitools.codegen.utils.JsonIncludePolicy; import org.openapitools.codegen.utils.JsonIncludePolicyUtils; import org.openapitools.codegen.utils.ModelUtils; +import org.openapitools.codegen.utils.TriStateBoolean; import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -184,10 +186,9 @@ public String getDescription() { @Setter private boolean useEnumValueInterface = false; private String valuedEnumClassName = "ValuedEnum"; @Setter private boolean suspendFunctions = false; - @Getter @Setter private String optionalNonNullPropertyJsonInclude = "NON_NULL"; - // Tri-state: null = unset (weak default + warning), Boolean.FALSE = weak (muted), Boolean.TRUE = strict emission. - @Getter @Setter private Boolean generateJsonIncludeAnnotations = null; - @Getter @Setter private Boolean generateJsonSetterNullsAnnotations = null; + @Getter @Setter private JsonIncludePolicy optionalNonNullPropertyJsonInclude = JsonIncludePolicy.NON_NULL; + @Getter @Setter private TriStateBoolean generateJsonIncludeAnnotations = TriStateBoolean.UNSET; + @Getter @Setter private TriStateBoolean generateJsonSetterNullsAnnotations = TriStateBoolean.UNSET; @Getter @Setter private boolean openApiNullable = false; @Getter @Setter protected boolean useDeductionForOneOfInterfaces = false; @@ -321,23 +322,15 @@ public KotlinSpringServerCodegen() { addSwitch(SUSPEND_FUNCTIONS, "Whether to generate suspend functions for API operations. Useful for Spring MVC with Kotlin coroutines without requiring the full reactive stack.", suspendFunctions); CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, - "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " - + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " - + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_DEFAULT", "Omit the property when its value equals the default."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NONE", "Emit no @JsonInclude annotation; defer to the global ObjectMapper."); - optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude); + JsonIncludePolicyUtils.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC); + for (JsonIncludePolicy policy : JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES) { + optionalNonNullPropertyJsonIncludeOpt.addEnum(policy.name(), policy.getDescription()); + } + optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude.name()); cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); addSwitch(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, - "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " - + "spec-honest annotations (required-field protection and the optional non-nullable policy from " - + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " - + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " - + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " - + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.", false); + JsonIncludePolicyUtils.GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC, false); addSwitch(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + "When true, emits @JsonSetter (Nulls.FAIL when openApiNullable is true, otherwise Nulls.SKIP) so " @@ -764,20 +757,20 @@ public void processOpts() { writePropertyBack(SUSPEND_FUNCTIONS, suspendFunctions); if (additionalProperties.containsKey(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS)) { - this.setGenerateJsonIncludeAnnotations(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS)); + this.generateJsonIncludeAnnotations = TriStateBoolean.fromNullableBoolean(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS)); } - writePropertyBack(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, Boolean.TRUE.equals(generateJsonIncludeAnnotations)); + writePropertyBack(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, generateJsonIncludeAnnotations.isTrue()); if (additionalProperties.containsKey(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)) { - this.setGenerateJsonSetterNullsAnnotations(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)); + this.generateJsonSetterNullsAnnotations = TriStateBoolean.fromNullableBoolean(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)); } - writePropertyBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, Boolean.TRUE.equals(generateJsonSetterNullsAnnotations)); + writePropertyBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, generateJsonSetterNullsAnnotations.isTrue()); if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { - this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); + this.optionalNonNullPropertyJsonInclude = JsonIncludePolicy.valueOf(JsonIncludePolicyUtils.normalizeJsonIncludePolicy( + additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString(), + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)); } - this.optionalNonNullPropertyJsonInclude = JsonIncludePolicyUtils.normalizeJsonIncludePolicy( - this.optionalNonNullPropertyJsonInclude, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); - writePropertyBack(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); - if (generateJsonIncludeAnnotations == null) { + writePropertyBack(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude.name()); + if (generateJsonIncludeAnnotations.isUnset()) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " @@ -786,7 +779,7 @@ public void processOpts() { CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); } - if (generateJsonSetterNullsAnnotations == null) { + if (generateJsonSetterNullsAnnotations.isUnset()) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " @@ -1346,7 +1339,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // generateJsonSetterNullsAnnotations is explicitly enabled. // When openApiNullable=true: Nulls.FAIL → reject explicit null (strict PATCH semantics). // When openApiNullable=false: Nulls.SKIP → silently ignore explicit null (lenient, protects defaults). - if (Boolean.TRUE.equals(generateJsonSetterNullsAnnotations) && !property.required && !property.isNullable) { + if (generateJsonSetterNullsAnnotations.isTrue() && !property.required && !property.isNullable) { if (openApiNullable) { property.vendorExtensions.put("x-has-json-setter-nulls-fail", true); } else { @@ -1413,17 +1406,17 @@ private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty proper } return; } - if (!Boolean.TRUE.equals(generateJsonIncludeAnnotations)) { + if (!generateJsonIncludeAnnotations.isTrue()) { return; } - String policy = null; + JsonIncludePolicy policy = null; if (property.required) { - policy = "ALWAYS"; + policy = JsonIncludePolicy.ALWAYS; } else if (!property.isNullable) { policy = optionalNonNullPropertyJsonInclude; } - if (JsonIncludePolicyUtils.isJsonIncludePolicyEmitted(policy)) { - property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy); + if (policy != null && policy.isEmitted()) { + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy.name()); model.imports.add("JsonInclude"); } } @@ -1574,7 +1567,7 @@ public ModelsMap postProcessModelsEnum(ModelsMap objs) { for (CodegenProperty var : cm.optionalVars) { // Scenario 3: optional + non-nullable → emit @JsonSetter when generateJsonSetterNullsAnnotations is enabled. // openApiNullable=true: Nulls.FAIL (strict). openApiNullable=false: Nulls.SKIP (lenient). - if (Boolean.TRUE.equals(generateJsonSetterNullsAnnotations) && !var.required && !var.isNullable) { + if (generateJsonSetterNullsAnnotations.isTrue() && !var.required && !var.isNullable) { if (openApiNullable) { var.vendorExtensions.put("x-has-json-setter-nulls-fail", true); } else { 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 9ed49f55c9f9..22f844420e01 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 @@ -40,9 +40,11 @@ import org.openapitools.codegen.templating.mustache.SplitStringLambda; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; import org.openapitools.codegen.templating.mustache.TrimWhitespaceLambda; +import org.openapitools.codegen.utils.JsonIncludePolicy; import org.openapitools.codegen.utils.JsonIncludePolicyUtils; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ProcessUtils; +import org.openapitools.codegen.utils.TriStateBoolean; import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -162,10 +164,9 @@ public enum RequestMappingMode { @Setter protected boolean apiFirst = false; protected boolean useOptional = false; @Setter protected boolean useSealed = false; - @Getter @Setter protected String optionalNonNullPropertyJsonInclude = "NON_NULL"; - // Tri-state: null = unset (weak default + warning), Boolean.FALSE = weak (muted), Boolean.TRUE = strict emission. - @Getter @Setter protected Boolean generateJsonIncludeAnnotations = null; - @Getter @Setter protected Boolean generateJsonSetterNullsAnnotations = null; + @Getter @Setter protected JsonIncludePolicy optionalNonNullPropertyJsonInclude = JsonIncludePolicy.NON_NULL; + @Getter @Setter protected TriStateBoolean generateJsonIncludeAnnotations = TriStateBoolean.UNSET; + @Getter @Setter protected TriStateBoolean generateJsonSetterNullsAnnotations = TriStateBoolean.UNSET; @Setter protected boolean virtualService = false; @Setter protected boolean hateoas = false; @Setter protected boolean returnSuccessCode = false; @@ -291,23 +292,15 @@ public SpringCodegen() { "Whether to generate sealed model interfaces and classes")); CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, - "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " - + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " - + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_NULL", "Omit the property when its value is null (default, spec-safe for non-nullable fields)."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_EMPTY", "Omit the property when its value is null or considered empty."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NON_DEFAULT", "Omit the property when its value equals the default."); - optionalNonNullPropertyJsonIncludeOpt.addEnum("NONE", "Emit no @JsonInclude annotation; defer to the global ObjectMapper."); - optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude); + JsonIncludePolicyUtils.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC); + for (JsonIncludePolicy policy : JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES) { + optionalNonNullPropertyJsonIncludeOpt.addEnum(policy.name(), policy.getDescription()); + } + optionalNonNullPropertyJsonIncludeOpt.setDefault(optionalNonNullPropertyJsonInclude.name()); cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); cliOptions.add(CliOption.newBoolean(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, - "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " - + "spec-honest annotations (required-field protection and the optional non-nullable policy from " - + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " - + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " - + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " - + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag.", false)); + JsonIncludePolicyUtils.GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC, false)); cliOptions.add(CliOption.newBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + "When true, emits @JsonSetter so an explicit null in the payload does not overwrite the field. " @@ -588,16 +581,18 @@ public void processOpts() { convertPropertyToBooleanAndWriteBack(RETURN_SUCCESS_CODE, this::setReturnSuccessCode); convertPropertyToBooleanAndWriteBack(USE_SWAGGER_UI, this::setUseSwaggerUI); convertPropertyToBooleanAndWriteBack(USE_SEALED, this::setUseSealed); - convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, this::setGenerateJsonIncludeAnnotations); - convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, this::setGenerateJsonSetterNullsAnnotations); + convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, + value -> this.generateJsonIncludeAnnotations = TriStateBoolean.fromNullableBoolean(value)); + convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + value -> this.generateJsonSetterNullsAnnotations = TriStateBoolean.fromNullableBoolean(value)); if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { - this.setOptionalNonNullPropertyJsonInclude(additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString()); + this.optionalNonNullPropertyJsonInclude = JsonIncludePolicy.valueOf(JsonIncludePolicyUtils.normalizeJsonIncludePolicy( + additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString(), + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)); } - this.optionalNonNullPropertyJsonInclude = JsonIncludePolicyUtils.normalizeJsonIncludePolicy( - this.optionalNonNullPropertyJsonInclude, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); - additionalProperties.put(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude); + additionalProperties.put(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude.name()); if (jackson) { - if (generateJsonIncludeAnnotations == null) { + if (generateJsonIncludeAnnotations.isUnset()) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " @@ -606,7 +601,7 @@ public void processOpts() { CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); } - if (generateJsonSetterNullsAnnotations == null) { + if (generateJsonSetterNullsAnnotations.isUnset()) { LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " @@ -1273,7 +1268,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // Optional + non-nullable, when openApiNullable=false: add @JsonSetter(nulls = Nulls.SKIP) on the // setter so an explicit null in the payload does not overwrite the field's default. Only emitted when // generateJsonSetterNullsAnnotations is explicitly enabled; otherwise deserialization defers to the mapper. - if (Boolean.TRUE.equals(generateJsonSetterNullsAnnotations) && !property.required && !property.isNullable && !openApiNullable) { + if (generateJsonSetterNullsAnnotations.isTrue() && !property.required && !property.isNullable && !openApiNullable) { property.vendorExtensions.put("x-has-json-setter-nulls-skip", true); model.imports.add("JsonSetter"); model.imports.add("Nulls"); @@ -1297,15 +1292,15 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. property.vendorExtensions.remove(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); } - } else if (Boolean.TRUE.equals(generateJsonIncludeAnnotations)) { - String policy = null; + } else if (generateJsonIncludeAnnotations.isTrue()) { + JsonIncludePolicy policy = null; if (property.required) { - policy = property.isNullable ? "ALWAYS" : "NON_NULL"; + policy = property.isNullable ? JsonIncludePolicy.ALWAYS : JsonIncludePolicy.NON_NULL; } else if (!property.isNullable) { policy = optionalNonNullPropertyJsonInclude; } - if (JsonIncludePolicyUtils.isJsonIncludePolicyEmitted(policy)) { - property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy); + if (policy != null && policy.isEmitted()) { + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy.name()); model.imports.add("JsonInclude"); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicy.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicy.java new file mode 100644 index 000000000000..6c10f3f92b10 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicy.java @@ -0,0 +1,80 @@ +package org.openapitools.codegen.utils; + +import lombok.Getter; + +import java.util.EnumSet; +import java.util.Locale; +import java.util.Set; + +/** + * Mirrors {@code com.fasterxml.jackson.annotation.JsonInclude.Include} (the set of policies a + * generated {@code @JsonInclude} annotation can be given), plus a {@link #NONE} sentinel meaning + * "emit no {@code @JsonInclude} annotation at all", used by the {@code spring} and + * {@code kotlin-spring} generators (issue #24401) for: + * + *
    + *
  • the {@code optionalNonNullPropertyJsonInclude} config option (restricted to + * {@link #NON_NULL}, {@link #NON_EMPTY}, {@link #NON_DEFAULT}, {@link #NONE} — see + * {@link #OPTIONAL_NON_NULL_POLICIES})
    • + *
  • the resolved {@code x-jackson-json-include-policy} vendor extension value, whether set + * manually on a property in the spec or computed by the automatic required/nullable matrix + * (any value is allowed there)
    • + *
+ */ +@Getter +public enum JsonIncludePolicy { + ALWAYS, + NON_NULL("Omit the property when its value is null (default, spec-safe for non-nullable fields)."), + NON_ABSENT, + NON_EMPTY("Omit the property when its value is null or considered empty."), + NON_DEFAULT("Omit the property when its value equals the default."), + USE_DEFAULTS, + CUSTOM, + /** Sentinel meaning "emit no {@code @JsonInclude} annotation". */ + NONE("Emit no @JsonInclude annotation; defer to the global ObjectMapper."); + + /** + * CLI-facing description, only populated for the values in {@link #OPTIONAL_NON_NULL_POLICIES} + * (the only ones ever offered as a {@code CliOption} enum choice); {@code null} otherwise. + */ + private final String description; + + JsonIncludePolicy() { + this(null); + } + + JsonIncludePolicy(String description) { + this.description = description; + } + + /** The subset of policies accepted for the {@code optionalNonNullPropertyJsonInclude} config option. */ + public static final Set OPTIONAL_NON_NULL_POLICIES = + EnumSet.of(NON_NULL, NON_EMPTY, NON_DEFAULT, NONE); + + /** Whether this policy should result in an emitted {@code @JsonInclude} annotation. */ + public boolean isEmitted() { + return this != NONE; + } + + /** Whether this policy is a valid value for the {@code optionalNonNullPropertyJsonInclude} config option. */ + public boolean isValidOptionalNonNullPolicy() { + return OPTIONAL_NON_NULL_POLICIES.contains(this); + } + + /** + * Parse a raw string (trimmed, case-insensitive) into a {@link JsonIncludePolicy}, or return + * {@code null} if blank/whitespace-only (callers treat that the same as {@link #NONE}). + * + * @throws IllegalArgumentException if non-blank but not a valid {@link JsonIncludePolicy} name + */ + public static JsonIncludePolicy parse(Object rawPolicy) { + if (rawPolicy == null) { + return null; + } + String trimmed = rawPolicy.toString().trim(); + if (trimmed.isEmpty()) { + return null; + } + return JsonIncludePolicy.valueOf(trimmed.toUpperCase(Locale.ROOT)); + } +} diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java index e0f0d0b75f85..2d4f8c59f732 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java @@ -16,10 +16,7 @@ package org.openapitools.codegen.utils; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Locale; -import java.util.Set; +import org.openapitools.codegen.CodegenConstants; /** * Shared resolution/validation logic for the {@code x-jackson-json-include-policy} vendor extension and the @@ -28,58 +25,47 @@ */ public final class JsonIncludePolicyUtils { - /** Sentinel value meaning "emit no {@code @JsonInclude} annotation". */ - public static final String NONE = "NONE"; + /** Shared {@code CliOption} description for {@code optionalNonNullPropertyJsonInclude}. */ + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC = + "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " + + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."; - /** - * Valid {@code com.fasterxml.jackson.annotation.JsonInclude.Include} constant names accepted for a - * manual per-property {@code x-jackson-json-include-policy} override. {@code NONE} is a sentinel - * meaning "emit no annotation" and is handled separately (the extension is dropped). - */ - private static final Set VALID_JSON_INCLUDE_CONSTANTS = new HashSet<>(Arrays.asList( - "ALWAYS", "NON_NULL", "NON_ABSENT", "NON_EMPTY", "NON_DEFAULT", "USE_DEFAULTS", "CUSTOM")); - - /** Valid values for the {@code optionalNonNullPropertyJsonInclude} config option. */ - private static final Set VALID_OPTIONAL_NON_NULL_POLICIES = new HashSet<>(Arrays.asList( - "NON_NULL", "NON_EMPTY", "NON_DEFAULT", "NONE")); + /** Shared {@code CliOption} description for {@code generateJsonIncludeAnnotations}. */ + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC = + "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " + + "spec-honest annotations (required-field protection and the optional non-nullable policy from " + + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " + + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " + + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag."; private JsonIncludePolicyUtils() { } - /** - * Whether the given policy value (a manual override, or an already-resolved automatic policy) should - * result in an emitted {@code @JsonInclude} annotation. {@code null}, blank/whitespace-only, and the - * {@code NONE} sentinel (after trimming, case-insensitive) all mean "emit nothing". - */ - public static boolean isJsonIncludePolicyEmitted(Object policy) { - if (policy == null) { - return false; - } - String trimmed = policy.toString().trim(); - return !trimmed.isEmpty() && !NONE.equalsIgnoreCase(trimmed); - } - /** * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. * * @param rawPolicy the raw vendor extension value set directly on the property in the spec * @param extensionName the vendor extension key, used in the error message (kept generator-agnostic) - * @return the normalized (upper-case) policy to emit, or {@code null} when the override means + * @return the normalized (upper-case) policy name to emit, or {@code null} when the override means * "emit no annotation" ({@code NONE}/blank), in which case the caller must drop the extension. * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. */ public static String resolveManualJsonIncludePolicy(Object rawPolicy, String extensionName) { - if (!isJsonIncludePolicyEmitted(rawPolicy)) { - return null; - } - String normalized = rawPolicy.toString().trim().toUpperCase(Locale.ROOT); - if (!VALID_JSON_INCLUDE_CONSTANTS.contains(normalized)) { + JsonIncludePolicy parsed; + try { + parsed = JsonIncludePolicy.parse(rawPolicy); + } catch (IllegalArgumentException e) { throw new IllegalArgumentException(extensionName + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " + "no annotation, but was: " + rawPolicy); } - return normalized; + if (parsed == null || !parsed.isEmitted()) { + return null; + } + return parsed.name(); } /** @@ -88,19 +74,24 @@ public static String resolveManualJsonIncludePolicy(Object rawPolicy, String ext * @param policy the raw config option value (may be {@code null}, in which case the default * {@code NON_NULL} is returned) * @param optionName the config option name, used in the error message (kept generator-agnostic) - * @return the normalized (upper-case) policy: one of {@code NON_NULL}, {@code NON_EMPTY}, + * @return the normalized (upper-case) policy name: one of {@code NON_NULL}, {@code NON_EMPTY}, * {@code NON_DEFAULT}, {@code NONE}. * @throws IllegalArgumentException when the value is not one of the supported policies. */ public static String normalizeJsonIncludePolicy(String policy, String optionName) { if (policy == null) { - return "NON_NULL"; + return JsonIncludePolicy.NON_NULL.name(); + } + JsonIncludePolicy parsed; + try { + parsed = JsonIncludePolicy.valueOf(policy.trim().toUpperCase(java.util.Locale.ROOT)); + } catch (IllegalArgumentException e) { + parsed = null; } - String normalized = policy.trim().toUpperCase(Locale.ROOT); - if (!VALID_OPTIONAL_NON_NULL_POLICIES.contains(normalized)) { + if (parsed == null || !parsed.isValidOptionalNonNullPolicy()) { throw new IllegalArgumentException(optionName - + " must be one of NON_NULL, NON_EMPTY, NON_DEFAULT, NONE but was: " + policy); + + " must be one of " + JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES + " but was: " + policy); } - return normalized; + return parsed.name(); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java new file mode 100644 index 000000000000..c8a07567c0dd --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java @@ -0,0 +1,44 @@ +package org.openapitools.codegen.utils; + +/** + * A tri-state toggle for boolean-like config options that need to distinguish "the user never set + * this" from an explicit {@code true}/{@code false}, e.g. so a weak default can be applied along + * with a one-time warning when the option was left unset, while an explicit {@code false} silently + * keeps the same default behavior. + * + *

This replaces the previous convention of using a boxed {@code Boolean} field where + * {@code null} meant "unset", which requires a code comment at every declaration site to be + * understandable. + */ +public enum TriStateBoolean { + /** The option was never explicitly set by the user (neither {@code true} nor {@code false}). */ + UNSET, + /** The option was explicitly set to {@code false}. */ + FALSE, + /** The option was explicitly set to {@code true}. */ + TRUE; + + /** Whether this state represents an explicit, affirmative opt-in ({@link #TRUE}). */ + public boolean isTrue() { + return this == TRUE; + } + + /** Whether the option was never explicitly set ({@link #UNSET}). */ + public boolean isUnset() { + return this == UNSET; + } + + /** + * Convert a nullable {@link Boolean} (the CLI/config-option convention where {@code null} means + * "not present in additionalProperties") into a {@link TriStateBoolean}. + * + * @param value {@code null} for unset, {@code Boolean.TRUE}/{@code Boolean.FALSE} for an explicit value + * @return {@link #UNSET}, {@link #TRUE}, or {@link #FALSE} + */ + public static TriStateBoolean fromNullableBoolean(Boolean value) { + if (value == null) { + return UNSET; + } + return value ? TRUE : FALSE; + } +} From 9632e7ee538c5b92d04e5ac94b562837f8e6840e Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Wed, 29 Jul 2026 17:23:36 +0200 Subject: [PATCH 15/20] update samples --- .../main/java/org/openapitools/model/Pet.java | 8 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../model/AdditionalPropertiesAnyTypeDto.java | 2 - .../model/AdditionalPropertiesArrayDto.java | 2 - .../model/AdditionalPropertiesBooleanDto.java | 2 - .../model/AdditionalPropertiesClassDto.java | 12 ---- .../model/AdditionalPropertiesIntegerDto.java | 2 - .../model/AdditionalPropertiesNumberDto.java | 2 - .../model/AdditionalPropertiesObjectDto.java | 2 - .../model/AdditionalPropertiesStringDto.java | 2 - .../org/openapitools/model/AnimalDto.java | 2 - .../openapitools/model/ApiResponseDto.java | 4 -- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 - .../model/ArrayOfNumberOnlyDto.java | 2 - .../org/openapitools/model/ArrayTestDto.java | 4 -- .../org/openapitools/model/BigCatDto.java | 2 - .../openapitools/model/CapitalizationDto.java | 7 --- .../java/org/openapitools/model/CatDto.java | 2 - .../org/openapitools/model/CategoryDto.java | 2 - .../model/ChildWithNullableDto.java | 2 - .../org/openapitools/model/ClassModelDto.java | 2 - .../org/openapitools/model/ClientDto.java | 2 - .../model/ContainerDefaultValueDto.java | 3 - .../java/org/openapitools/model/DogDto.java | 2 - .../org/openapitools/model/EnumArraysDto.java | 3 - .../org/openapitools/model/EnumTestDto.java | 5 -- .../java/org/openapitools/model/FileDto.java | 2 - .../model/FileSchemaTestClassDto.java | 3 - .../org/openapitools/model/FormatTestDto.java | 11 ---- .../model/HasOnlyReadOnlyDto.java | 3 - .../java/org/openapitools/model/ListDto.java | 2 - .../org/openapitools/model/MapTestDto.java | 5 -- ...ertiesAndAdditionalPropertiesClassDto.java | 4 -- .../model/Model200ResponseDto.java | 3 - .../java/org/openapitools/model/NameDto.java | 4 -- .../model/NullableMapPropertyDto.java | 2 - .../org/openapitools/model/NumberOnlyDto.java | 2 - .../java/org/openapitools/model/OrderDto.java | 7 --- .../openapitools/model/OuterCompositeDto.java | 4 -- .../model/ParentWithNullableDto.java | 3 - .../java/org/openapitools/model/PetDto.java | 5 -- .../openapitools/model/ReadOnlyFirstDto.java | 3 - ...ponseObjectWithDifferentFieldNamesDto.java | 5 -- .../org/openapitools/model/ReturnDto.java | 2 - .../model/SpecialModelNameDto.java | 2 - .../java/org/openapitools/model/TagDto.java | 3 - .../java/org/openapitools/model/UserDto.java | 9 --- .../org/openapitools/model/XmlItemDto.java | 30 --------- .../model/AdditionalPropertiesAnyTypeDto.java | 2 - .../model/AdditionalPropertiesArrayDto.java | 2 - .../model/AdditionalPropertiesBooleanDto.java | 2 - .../model/AdditionalPropertiesClassDto.java | 12 ---- .../model/AdditionalPropertiesIntegerDto.java | 2 - .../model/AdditionalPropertiesNumberDto.java | 2 - .../model/AdditionalPropertiesObjectDto.java | 2 - .../model/AdditionalPropertiesStringDto.java | 2 - .../org/openapitools/model/AnimalDto.java | 2 - .../openapitools/model/ApiResponseDto.java | 4 -- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 - .../model/ArrayOfNumberOnlyDto.java | 2 - .../org/openapitools/model/ArrayTestDto.java | 4 -- .../org/openapitools/model/BigCatDto.java | 2 - .../openapitools/model/CapitalizationDto.java | 7 --- .../java/org/openapitools/model/CatDto.java | 2 - .../org/openapitools/model/CategoryDto.java | 2 - .../model/ChildWithNullableDto.java | 2 - .../org/openapitools/model/ClassModelDto.java | 2 - .../org/openapitools/model/ClientDto.java | 2 - .../model/ContainerDefaultValueDto.java | 3 - .../java/org/openapitools/model/DogDto.java | 2 - .../org/openapitools/model/EnumArraysDto.java | 3 - .../org/openapitools/model/EnumTestDto.java | 5 -- .../java/org/openapitools/model/FileDto.java | 2 - .../model/FileSchemaTestClassDto.java | 3 - .../org/openapitools/model/FormatTestDto.java | 11 ---- .../model/HasOnlyReadOnlyDto.java | 3 - .../java/org/openapitools/model/ListDto.java | 2 - .../org/openapitools/model/MapTestDto.java | 5 -- ...ertiesAndAdditionalPropertiesClassDto.java | 4 -- .../model/Model200ResponseDto.java | 3 - .../java/org/openapitools/model/NameDto.java | 4 -- .../model/NullableMapPropertyDto.java | 2 - .../org/openapitools/model/NumberOnlyDto.java | 2 - .../java/org/openapitools/model/OrderDto.java | 7 --- .../openapitools/model/OuterCompositeDto.java | 4 -- .../model/ParentWithNullableDto.java | 3 - .../java/org/openapitools/model/PetDto.java | 5 -- .../openapitools/model/ReadOnlyFirstDto.java | 3 - ...ponseObjectWithDifferentFieldNamesDto.java | 5 -- .../org/openapitools/model/ReturnDto.java | 2 - .../model/SpecialModelNameDto.java | 2 - .../java/org/openapitools/model/TagDto.java | 3 - .../java/org/openapitools/model/UserDto.java | 9 --- .../org/openapitools/model/XmlItemDto.java | 30 --------- .../org/openapitools/model/CategoryDto.java | 7 --- .../java/org/openapitools/model/PetDto.java | 11 ---- .../java/org/openapitools/model/TagDto.java | 7 --- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyTypeDto.java | 5 -- .../model/AdditionalPropertiesArrayDto.java | 5 -- .../model/AdditionalPropertiesBooleanDto.java | 5 -- .../model/AdditionalPropertiesClassDto.java | 23 ------- .../model/AdditionalPropertiesIntegerDto.java | 5 -- .../model/AdditionalPropertiesNumberDto.java | 5 -- .../model/AdditionalPropertiesObjectDto.java | 5 -- .../model/AdditionalPropertiesStringDto.java | 5 -- .../org/openapitools/model/AnimalDto.java | 5 -- .../openapitools/model/ApiResponseDto.java | 9 --- .../model/ArrayOfArrayOfNumberOnlyDto.java | 5 -- .../model/ArrayOfNumberOnlyDto.java | 5 -- .../org/openapitools/model/ArrayTestDto.java | 9 --- .../org/openapitools/model/BigCatDto.java | 5 -- .../openapitools/model/CapitalizationDto.java | 15 ----- .../java/org/openapitools/model/CatDto.java | 5 -- .../org/openapitools/model/CategoryDto.java | 5 -- .../model/ChildWithNullableDto.java | 5 -- .../org/openapitools/model/ClassModelDto.java | 5 -- .../org/openapitools/model/ClientDto.java | 5 -- .../java/org/openapitools/model/DogDto.java | 5 -- .../org/openapitools/model/EnumArraysDto.java | 7 --- .../org/openapitools/model/EnumTestDto.java | 11 ---- .../java/org/openapitools/model/FileDto.java | 5 -- .../model/FileSchemaTestClassDto.java | 7 --- .../org/openapitools/model/FormatTestDto.java | 23 ------- .../model/HasOnlyReadOnlyDto.java | 7 --- .../java/org/openapitools/model/ListDto.java | 5 -- .../org/openapitools/model/MapTestDto.java | 11 ---- ...ertiesAndAdditionalPropertiesClassDto.java | 9 --- .../model/Model200ResponseDto.java | 7 --- .../java/org/openapitools/model/NameDto.java | 9 --- .../org/openapitools/model/NumberOnlyDto.java | 5 -- .../java/org/openapitools/model/OrderDto.java | 15 ----- .../openapitools/model/OuterCompositeDto.java | 9 --- .../model/ParentWithNullableDto.java | 5 -- .../java/org/openapitools/model/PetDto.java | 11 ---- .../openapitools/model/ReadOnlyFirstDto.java | 7 --- ...ponseObjectWithDifferentFieldNamesDto.java | 11 ---- .../org/openapitools/model/ReturnDto.java | 5 -- .../model/SpecialModelNameDto.java | 5 -- .../java/org/openapitools/model/TagDto.java | 7 --- .../java/org/openapitools/model/UserDto.java | 19 ------ .../org/openapitools/model/XmlItemDto.java | 61 ------------------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyTypeDto.java | 2 - .../model/AdditionalPropertiesArrayDto.java | 2 - .../model/AdditionalPropertiesBooleanDto.java | 2 - .../model/AdditionalPropertiesClassDto.java | 12 ---- .../model/AdditionalPropertiesIntegerDto.java | 2 - .../model/AdditionalPropertiesNumberDto.java | 2 - .../model/AdditionalPropertiesObjectDto.java | 2 - .../model/AdditionalPropertiesStringDto.java | 2 - .../org/openapitools/model/AnimalDto.java | 2 - .../openapitools/model/ApiResponseDto.java | 4 -- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 - .../model/ArrayOfNumberOnlyDto.java | 2 - .../org/openapitools/model/ArrayTestDto.java | 4 -- .../org/openapitools/model/BigCatDto.java | 2 - .../openapitools/model/CapitalizationDto.java | 7 --- .../java/org/openapitools/model/CatDto.java | 2 - .../org/openapitools/model/CategoryDto.java | 2 - .../model/ChildWithNullableDto.java | 2 - .../org/openapitools/model/ClassModelDto.java | 2 - .../org/openapitools/model/ClientDto.java | 2 - .../model/ContainerDefaultValueDto.java | 3 - .../java/org/openapitools/model/DogDto.java | 2 - .../org/openapitools/model/EnumArraysDto.java | 3 - .../org/openapitools/model/EnumTestDto.java | 5 -- .../java/org/openapitools/model/FileDto.java | 2 - .../model/FileSchemaTestClassDto.java | 3 - .../org/openapitools/model/FormatTestDto.java | 11 ---- .../model/HasOnlyReadOnlyDto.java | 3 - .../java/org/openapitools/model/ListDto.java | 2 - .../org/openapitools/model/MapTestDto.java | 5 -- ...ertiesAndAdditionalPropertiesClassDto.java | 4 -- .../model/Model200ResponseDto.java | 3 - .../java/org/openapitools/model/NameDto.java | 4 -- .../model/NullableMapPropertyDto.java | 2 - .../org/openapitools/model/NumberOnlyDto.java | 2 - .../java/org/openapitools/model/OrderDto.java | 7 --- .../openapitools/model/OuterCompositeDto.java | 4 -- .../model/ParentWithNullableDto.java | 3 - .../java/org/openapitools/model/PetDto.java | 5 -- .../openapitools/model/ReadOnlyFirstDto.java | 3 - ...ponseObjectWithDifferentFieldNamesDto.java | 5 -- .../org/openapitools/model/ReturnDto.java | 2 - .../model/SpecialModelNameDto.java | 2 - .../java/org/openapitools/model/TagDto.java | 3 - .../java/org/openapitools/model/UserDto.java | 9 --- .../org/openapitools/model/XmlItemDto.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 7 --- .../openapitools/model/ModelApiResponse.java | 9 --- .../java/org/openapitools/model/Order.java | 15 ----- .../main/java/org/openapitools/model/Pet.java | 11 ---- .../main/java/org/openapitools/model/Tag.java | 7 --- .../java/org/openapitools/model/User.java | 19 ------ .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../main/java/org/openapitools/model/Pet.java | 8 --- .../java/org/openapitools/model/Category.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../org/openapitools/model/Addressable.java | 3 - .../java/org/openapitools/model/Animal.java | 1 - .../main/java/org/openapitools/model/Bar.java | 4 -- .../org/openapitools/model/BarCreate.java | 4 -- .../java/org/openapitools/model/BarRef.java | 1 - .../org/openapitools/model/BarRefOrValue.java | 1 - .../main/java/org/openapitools/model/Cat.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../java/org/openapitools/model/Entity.java | 5 -- .../org/openapitools/model/EntityRef.java | 7 --- .../org/openapitools/model/Extensible.java | 3 - .../main/java/org/openapitools/model/Foo.java | 3 - .../java/org/openapitools/model/FooRef.java | 2 - .../org/openapitools/model/FooRefOrValue.java | 1 - .../java/org/openapitools/model/Pasta.java | 2 - .../java/org/openapitools/model/Pizza.java | 2 - .../org/openapitools/model/PizzaSpeziale.java | 2 - .../org/openapitools/model/Addressable.java | 3 - .../java/org/openapitools/model/Animal.java | 1 - .../main/java/org/openapitools/model/Bar.java | 4 -- .../org/openapitools/model/BarCreate.java | 4 -- .../java/org/openapitools/model/BarRef.java | 1 - .../org/openapitools/model/BarRefOrValue.java | 1 - .../main/java/org/openapitools/model/Cat.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../java/org/openapitools/model/Entity.java | 5 -- .../org/openapitools/model/EntityRef.java | 7 --- .../org/openapitools/model/Extensible.java | 3 - .../main/java/org/openapitools/model/Foo.java | 3 - .../java/org/openapitools/model/FooRef.java | 2 - .../org/openapitools/model/FooRefOrValue.java | 1 - .../java/org/openapitools/model/Pasta.java | 2 - .../java/org/openapitools/model/Pizza.java | 2 - .../org/openapitools/model/PizzaSpeziale.java | 2 - .../org/openapitools/model/Addressable.java | 3 - .../java/org/openapitools/model/Animal.java | 1 - .../main/java/org/openapitools/model/Bar.java | 4 -- .../org/openapitools/model/BarCreate.java | 4 -- .../java/org/openapitools/model/BarRef.java | 1 - .../org/openapitools/model/BarRefOrValue.java | 1 - .../main/java/org/openapitools/model/Cat.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../java/org/openapitools/model/Entity.java | 5 -- .../org/openapitools/model/EntityRef.java | 7 --- .../org/openapitools/model/Extensible.java | 3 - .../main/java/org/openapitools/model/Foo.java | 3 - .../java/org/openapitools/model/FooRef.java | 2 - .../org/openapitools/model/FooRefOrValue.java | 1 - .../java/org/openapitools/model/Pasta.java | 2 - .../java/org/openapitools/model/Pizza.java | 2 - .../org/openapitools/model/PizzaSpeziale.java | 2 - .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../main/java/org/openapitools/model/Foo.java | 13 ---- .../java/org/openapitools/model/Category.java | 7 --- .../openapitools/model/ModelApiResponse.java | 9 --- .../java/org/openapitools/model/Order.java | 15 ----- .../main/java/org/openapitools/model/Pet.java | 11 ---- .../main/java/org/openapitools/model/Tag.java | 7 --- .../java/org/openapitools/model/User.java | 19 ------ .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../kotlin/org/openapitools/model/Animal.kt | 3 - .../org/openapitools/model/AnotherAnimal.kt | 3 - .../kotlin/org/openapitools/model/Bird.kt | 7 --- .../kotlin/org/openapitools/model/Robobird.kt | 7 --- .../java/org/openapitools/model/Category.java | 1 - .../openapitools/model/ModelApiResponse.java | 1 - .../java/org/openapitools/model/Order.java | 1 - .../main/java/org/openapitools/model/Pet.java | 1 - .../main/java/org/openapitools/model/Tag.java | 1 - .../java/org/openapitools/model/User.java | 1 - .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../org/openapitools/model/Annotation.kt | 5 -- .../org/openapitools/model/AnyOfUserOrPet.kt | 23 ------- .../model/AnyOfUserOrPetOrArrayString.kt | 23 ------- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 17 ------ .../org/openapitools/model/UserOrPet.kt | 3 - .../model/UserOrPetOrArrayString.kt | 3 - .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../main/kotlin/org/openapitools/model/Apa.kt | 7 --- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../main/kotlin/org/openapitools/model/Cat.kt | 15 ----- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../main/kotlin/org/openapitools/model/Dog.kt | 11 ---- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 3 - .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/ApiError.kt | 5 -- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../model/MultipartMixedRequestMarker.kt | 5 -- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Order.kt | 7 --- .../main/kotlin/org/openapitools/model/Pet.kt | 7 --- .../org/openapitools/model/SearchResult.kt | 9 --- .../kotlin/org/openapitools/model/User.kt | 7 --- .../kotlin/org/openapitools/model/UserList.kt | 7 --- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Animal.kt | 3 - .../main/kotlin/org/openapitools/model/Cat.kt | 7 --- .../kotlin/org/openapitools/model/Category.kt | 5 -- .../kotlin/org/openapitools/model/Client.kt | 5 -- .../main/kotlin/org/openapitools/model/Dog.kt | 7 --- .../main/kotlin/org/openapitools/model/Foo.kt | 5 -- .../model/FooGetDefaultResponse.kt | 5 -- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../org/openapitools/model/NullableModel.kt | 6 -- .../main/kotlin/org/openapitools/model/Pet.kt | 7 --- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../main/kotlin/org/openapitools/model/Cat.kt | 15 ----- .../kotlin/org/openapitools/model/Category.kt | 7 --- .../main/kotlin/org/openapitools/model/Dog.kt | 11 ---- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 3 - .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../kotlin/org/openapitools/model/Category.kt | 7 --- .../openapitools/model/ModelApiResponse.kt | 9 --- .../kotlin/org/openapitools/model/Order.kt | 15 ----- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ---- .../main/kotlin/org/openapitools/model/Tag.kt | 7 --- .../kotlin/org/openapitools/model/User.kt | 19 ------ .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/ObjectWithUniqueItems.java | 7 --- .../main/java/org/openapitools/model/Dog.java | 3 - .../java/org/openapitools/model/Error.java | 3 - .../model/AdditionalPropertiesAnyType.java | 5 -- .../model/AdditionalPropertiesArray.java | 5 -- .../model/AdditionalPropertiesBoolean.java | 5 -- .../model/AdditionalPropertiesClass.java | 23 ------- .../model/AdditionalPropertiesInteger.java | 5 -- .../model/AdditionalPropertiesNumber.java | 5 -- .../model/AdditionalPropertiesObject.java | 5 -- .../model/AdditionalPropertiesString.java | 5 -- .../java/org/openapitools/model/Animal.java | 5 -- .../model/ArrayOfArrayOfNumberOnly.java | 5 -- .../openapitools/model/ArrayOfNumberOnly.java | 5 -- .../org/openapitools/model/ArrayTest.java | 9 --- .../java/org/openapitools/model/BigCat.java | 5 -- .../openapitools/model/Capitalization.java | 15 ----- .../main/java/org/openapitools/model/Cat.java | 5 -- .../java/org/openapitools/model/Category.java | 5 -- .../openapitools/model/ChildWithNullable.java | 5 -- .../org/openapitools/model/ClassModel.java | 5 -- .../java/org/openapitools/model/Client.java | 5 -- .../main/java/org/openapitools/model/Dog.java | 5 -- .../org/openapitools/model/EnumArrays.java | 7 --- .../java/org/openapitools/model/EnumTest.java | 11 ---- .../java/org/openapitools/model/File.java | 5 -- .../model/FileSchemaTestClass.java | 7 --- .../org/openapitools/model/FormatTest.java | 23 ------- .../openapitools/model/HasOnlyReadOnly.java | 7 --- .../java/org/openapitools/model/MapTest.java | 11 ---- ...ropertiesAndAdditionalPropertiesClass.java | 9 --- .../openapitools/model/Model200Response.java | 7 --- .../openapitools/model/ModelApiResponse.java | 9 --- .../org/openapitools/model/ModelList.java | 5 -- .../org/openapitools/model/ModelReturn.java | 5 -- .../java/org/openapitools/model/Name.java | 9 --- .../org/openapitools/model/NumberOnly.java | 5 -- .../java/org/openapitools/model/Order.java | 15 ----- .../openapitools/model/OuterComposite.java | 9 --- .../model/ParentWithNullable.java | 5 -- .../main/java/org/openapitools/model/Pet.java | 11 ---- .../org/openapitools/model/ReadOnlyFirst.java | 7 --- ...ResponseObjectWithDifferentFieldNames.java | 11 ---- .../openapitools/model/SpecialModelName.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 7 --- .../java/org/openapitools/model/User.java | 19 ------ .../java/org/openapitools/model/XmlItem.java | 61 ------------------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyTypeDto.java | 2 - .../model/AdditionalPropertiesArrayDto.java | 2 - .../model/AdditionalPropertiesBooleanDto.java | 2 - .../model/AdditionalPropertiesClassDto.java | 12 ---- .../model/AdditionalPropertiesIntegerDto.java | 2 - .../model/AdditionalPropertiesNumberDto.java | 2 - .../model/AdditionalPropertiesObjectDto.java | 2 - .../model/AdditionalPropertiesStringDto.java | 2 - .../org/openapitools/model/AnimalDto.java | 2 - .../openapitools/model/ApiResponseDto.java | 4 -- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 - .../model/ArrayOfNumberOnlyDto.java | 2 - .../org/openapitools/model/ArrayTestDto.java | 4 -- .../org/openapitools/model/BigCatDto.java | 2 - .../openapitools/model/CapitalizationDto.java | 7 --- .../java/org/openapitools/model/CatDto.java | 2 - .../org/openapitools/model/CategoryDto.java | 2 - .../model/ChildWithNullableDto.java | 2 - .../org/openapitools/model/ClassModelDto.java | 2 - .../org/openapitools/model/ClientDto.java | 2 - .../model/ContainerDefaultValueDto.java | 3 - .../java/org/openapitools/model/DogDto.java | 2 - .../org/openapitools/model/EnumArraysDto.java | 3 - .../org/openapitools/model/EnumTestDto.java | 5 -- .../java/org/openapitools/model/FileDto.java | 2 - .../model/FileSchemaTestClassDto.java | 3 - .../org/openapitools/model/FormatTestDto.java | 11 ---- .../model/HasOnlyReadOnlyDto.java | 3 - .../java/org/openapitools/model/ListDto.java | 2 - .../org/openapitools/model/MapTestDto.java | 5 -- ...ertiesAndAdditionalPropertiesClassDto.java | 4 -- .../model/Model200ResponseDto.java | 3 - .../java/org/openapitools/model/NameDto.java | 4 -- .../model/NullableMapPropertyDto.java | 2 - .../org/openapitools/model/NumberOnlyDto.java | 2 - .../java/org/openapitools/model/OrderDto.java | 7 --- .../openapitools/model/OuterCompositeDto.java | 4 -- .../model/ParentWithNullableDto.java | 3 - .../java/org/openapitools/model/PetDto.java | 5 -- .../openapitools/model/ReadOnlyFirstDto.java | 3 - ...ponseObjectWithDifferentFieldNamesDto.java | 5 -- .../org/openapitools/model/ReturnDto.java | 2 - .../model/SpecialModelNameDto.java | 2 - .../java/org/openapitools/model/TagDto.java | 3 - .../java/org/openapitools/model/UserDto.java | 9 --- .../org/openapitools/model/XmlItemDto.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/Order.java | 3 - .../main/java/org/openapitools/model/Pet.java | 3 - .../org/openapitools/model/SearchResult.java | 4 -- .../java/org/openapitools/model/User.java | 3 - .../java/org/openapitools/model/UserList.java | 3 - .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../org/openapitools/model/NullableModel.java | 3 - .../main/java/org/openapitools/model/Pet.java | 3 - .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../java/org/openapitools/model/Category.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../java/org/openapitools/model/Order.java | 7 --- .../main/java/org/openapitools/model/Pet.java | 5 -- .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../java/org/openapitools/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../java/org/openapitools/model/BigCat.java | 2 - .../openapitools/model/Capitalization.java | 7 --- .../main/java/org/openapitools/model/Cat.java | 2 - .../java/org/openapitools/model/Category.java | 2 - .../openapitools/model/ChildWithNullable.java | 2 - .../org/openapitools/model/ClassModel.java | 2 - .../java/org/openapitools/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../main/java/org/openapitools/model/Dog.java | 2 - .../org/openapitools/model/EnumArrays.java | 3 - .../java/org/openapitools/model/EnumTest.java | 5 -- .../java/org/openapitools/model/File.java | 2 - .../model/FileSchemaTestClass.java | 3 - .../org/openapitools/model/FormatTest.java | 11 ---- .../openapitools/model/HasOnlyReadOnly.java | 3 - .../java/org/openapitools/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../openapitools/model/Model200Response.java | 3 - .../openapitools/model/ModelApiResponse.java | 4 -- .../org/openapitools/model/ModelList.java | 2 - .../org/openapitools/model/ModelReturn.java | 2 - .../java/org/openapitools/model/Name.java | 4 -- .../model/NullableMapProperty.java | 2 - .../org/openapitools/model/NumberOnly.java | 2 - .../java/org/openapitools/model/Order.java | 7 --- .../openapitools/model/OuterComposite.java | 4 -- .../model/ParentWithNullable.java | 3 - .../main/java/org/openapitools/model/Pet.java | 5 -- .../org/openapitools/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../openapitools/model/SpecialModelName.java | 2 - .../main/java/org/openapitools/model/Tag.java | 3 - .../java/org/openapitools/model/User.java | 9 --- .../java/org/openapitools/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesAnyType.java | 2 - .../model/AdditionalPropertiesArray.java | 2 - .../model/AdditionalPropertiesBoolean.java | 2 - .../model/AdditionalPropertiesClass.java | 12 ---- .../model/AdditionalPropertiesInteger.java | 2 - .../model/AdditionalPropertiesNumber.java | 2 - .../model/AdditionalPropertiesObject.java | 2 - .../model/AdditionalPropertiesString.java | 2 - .../openapitools/virtualan/model/Animal.java | 2 - .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../virtualan/model/ArrayOfNumberOnly.java | 2 - .../virtualan/model/ArrayTest.java | 4 -- .../openapitools/virtualan/model/BigCat.java | 2 - .../virtualan/model/Capitalization.java | 7 --- .../org/openapitools/virtualan/model/Cat.java | 2 - .../virtualan/model/Category.java | 2 - .../virtualan/model/ChildWithNullable.java | 2 - .../virtualan/model/ClassModel.java | 2 - .../openapitools/virtualan/model/Client.java | 2 - .../model/ContainerDefaultValue.java | 3 - .../org/openapitools/virtualan/model/Dog.java | 2 - .../virtualan/model/EnumArrays.java | 3 - .../virtualan/model/EnumTest.java | 5 -- .../openapitools/virtualan/model/File.java | 2 - .../virtualan/model/FileSchemaTestClass.java | 3 - .../virtualan/model/FormatTest.java | 11 ---- .../virtualan/model/HasOnlyReadOnly.java | 3 - .../openapitools/virtualan/model/MapTest.java | 5 -- ...ropertiesAndAdditionalPropertiesClass.java | 4 -- .../virtualan/model/Model200Response.java | 3 - .../virtualan/model/ModelApiResponse.java | 4 -- .../virtualan/model/ModelList.java | 2 - .../virtualan/model/ModelReturn.java | 2 - .../openapitools/virtualan/model/Name.java | 4 -- .../virtualan/model/NullableMapProperty.java | 2 - .../virtualan/model/NumberOnly.java | 2 - .../openapitools/virtualan/model/Order.java | 7 --- .../virtualan/model/OuterComposite.java | 4 -- .../virtualan/model/ParentWithNullable.java | 3 - .../org/openapitools/virtualan/model/Pet.java | 5 -- .../virtualan/model/ReadOnlyFirst.java | 3 - ...ResponseObjectWithDifferentFieldNames.java | 5 -- .../virtualan/model/SpecialModelName.java | 2 - .../org/openapitools/virtualan/model/Tag.java | 3 - .../openapitools/virtualan/model/User.java | 9 --- .../openapitools/virtualan/model/XmlItem.java | 30 --------- .../model/AdditionalPropertiesClassDto.java | 3 - .../model/AllOfWithSingleRefDto.java | 3 - .../org/openapitools/model/AnimalDto.java | 2 - .../openapitools/model/ApiResponseDto.java | 4 -- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 - .../model/ArrayOfNumberOnlyDto.java | 2 - .../org/openapitools/model/ArrayTestDto.java | 4 -- .../openapitools/model/CapitalizationDto.java | 7 --- .../java/org/openapitools/model/CatDto.java | 2 - .../org/openapitools/model/CategoryDto.java | 2 - .../model/ChildWithNullableDto.java | 2 - .../org/openapitools/model/ClassModelDto.java | 2 - .../org/openapitools/model/ClientDto.java | 2 - .../model/DeprecatedObjectDto.java | 2 - .../java/org/openapitools/model/DogDto.java | 2 - .../org/openapitools/model/EnumArraysDto.java | 3 - .../org/openapitools/model/EnumTestDto.java | 8 --- .../FakeBigDecimalMap200ResponseDto.java | 3 - .../java/org/openapitools/model/FileDto.java | 2 - .../model/FileSchemaTestClassDto.java | 3 - .../java/org/openapitools/model/FooDto.java | 2 - .../model/FooGetDefaultResponseDto.java | 2 - .../org/openapitools/model/FormatTestDto.java | 13 ---- .../model/HasOnlyReadOnlyDto.java | 3 - .../model/HealthCheckResultDto.java | 2 - .../java/org/openapitools/model/ListDto.java | 2 - .../org/openapitools/model/MapTestDto.java | 5 -- ...ertiesAndAdditionalPropertiesClassDto.java | 4 -- .../model/Model200ResponseDto.java | 3 - .../java/org/openapitools/model/NameDto.java | 4 -- .../openapitools/model/NullableClassDto.java | 13 ---- .../org/openapitools/model/NumberOnlyDto.java | 2 - .../model/ObjectWithDeprecatedFieldsDto.java | 5 -- .../java/org/openapitools/model/OrderDto.java | 7 --- .../openapitools/model/OuterCompositeDto.java | 4 -- .../model/ParentWithNullableDto.java | 3 - .../java/org/openapitools/model/PetDto.java | 5 -- .../openapitools/model/ReadOnlyFirstDto.java | 3 - .../org/openapitools/model/ReturnDto.java | 2 - .../model/SpecialModelNameDto.java | 2 - .../java/org/openapitools/model/TagDto.java | 3 - ...reeformAdditionalPropertiesRequestDto.java | 2 - .../java/org/openapitools/model/UserDto.java | 9 --- .../model/AdditionalPropertiesAnyTypeDto.java | 2 - .../model/AdditionalPropertiesArrayDto.java | 2 - .../model/AdditionalPropertiesBooleanDto.java | 2 - .../model/AdditionalPropertiesClassDto.java | 12 ---- .../model/AdditionalPropertiesIntegerDto.java | 2 - .../model/AdditionalPropertiesNumberDto.java | 2 - .../model/AdditionalPropertiesObjectDto.java | 2 - .../model/AdditionalPropertiesStringDto.java | 2 - .../org/openapitools/model/AnimalDto.java | 2 - .../openapitools/model/ApiResponseDto.java | 4 -- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 - .../model/ArrayOfNumberOnlyDto.java | 2 - .../org/openapitools/model/ArrayTestDto.java | 4 -- .../org/openapitools/model/BigCatDto.java | 2 - .../openapitools/model/CapitalizationDto.java | 7 --- .../java/org/openapitools/model/CatDto.java | 2 - .../org/openapitools/model/CategoryDto.java | 2 - .../model/ChildWithNullableDto.java | 2 - .../org/openapitools/model/ClassModelDto.java | 2 - .../org/openapitools/model/ClientDto.java | 2 - .../model/ContainerDefaultValueDto.java | 3 - .../java/org/openapitools/model/DogDto.java | 2 - .../org/openapitools/model/EnumArraysDto.java | 3 - .../org/openapitools/model/EnumTestDto.java | 5 -- .../java/org/openapitools/model/FileDto.java | 2 - .../model/FileSchemaTestClassDto.java | 3 - .../org/openapitools/model/FormatTestDto.java | 11 ---- .../model/HasOnlyReadOnlyDto.java | 3 - .../java/org/openapitools/model/ListDto.java | 2 - .../org/openapitools/model/MapTestDto.java | 5 -- ...ertiesAndAdditionalPropertiesClassDto.java | 4 -- .../model/Model200ResponseDto.java | 3 - .../java/org/openapitools/model/NameDto.java | 4 -- .../model/NullableMapPropertyDto.java | 2 - .../org/openapitools/model/NumberOnlyDto.java | 2 - .../java/org/openapitools/model/OrderDto.java | 7 --- .../openapitools/model/OuterCompositeDto.java | 4 -- .../model/ParentWithNullableDto.java | 3 - .../java/org/openapitools/model/PetDto.java | 5 -- .../openapitools/model/ReadOnlyFirstDto.java | 3 - ...ponseObjectWithDifferentFieldNamesDto.java | 5 -- .../org/openapitools/model/ReturnDto.java | 2 - .../model/SpecialModelNameDto.java | 2 - .../java/org/openapitools/model/TagDto.java | 3 - .../java/org/openapitools/model/UserDto.java | 9 --- .../org/openapitools/model/XmlItemDto.java | 30 --------- 1702 files changed, 8699 deletions(-) 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 4aa4e0f36117..bf8f8eb792e3 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,7 +2,6 @@ import java.net.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; @@ -31,27 +30,20 @@ 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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 74019567a021..4045165cbcdb 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +28,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +74,8 @@ 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 0d9d99f20e09..a2f0f03becca 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +29,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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(); @@ -41,7 +38,6 @@ public class Pet { @Deprecated private List photoUrls = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -81,7 +77,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1268109b1c52..28e0b05c9442 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 f655d26b20a7..d50008b0cc77 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3665a31120b1..56fabc4802f2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 88db835bec6e..9ee262b57a0d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4ff49b47180..9059f36e9d72 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 46a16d7fe21d..16528218f0d3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,37 +30,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 93c202cbb8e2..ef52762719a5 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f046c66ab55f..02ad45d74984 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 16220457f32d..120fb59f5f18 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4dd1893a48ce..249877c4ac70 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c724049e493b..4e3062b2339a 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,7 +3,6 @@ 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,7 +38,6 @@ 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 692519fbf52b..9ed8d118da44 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1302d3c84ad6..880c523df38c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 656e2d802f3b..edb22d6166cb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 802a19d1f683..d73667ee4139 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2efdf75f4ebe..90e467b21144 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,7 +3,6 @@ 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,7 +68,6 @@ 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 310065b7a9cf..86cbe2870435 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0248241d2b..6604e25ffd46 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 20129cb89013..20132c1f51e1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e04fac3f7eff..b5549b48f767 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,7 +3,6 @@ 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,7 +31,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d47ae0891d92..c63747c03fa1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7e6f894682b3..0277b2fe9dbb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index ccb8f5a5647f..21bcc6d948d3 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +28,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 10728f3d3b60..e4db70c81934 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 993a1e525a32..fa197fad8b91 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +62,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -101,7 +99,6 @@ 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 9c39a7569a81..4483d86c8642 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ 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 f50352c73c68..16c8a91e0a4a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 eb7d6e45c9f5..c91111f68845 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ac2ef6be7859..998483b87e0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 622239efc34b..d8371c307a43 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 450d878f9685..b10a710ea30f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bea5213283f1..5892bb2e67c5 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -65,13 +63,10 @@ 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 185e777b68e9..f69d90792b3b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,14 +29,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 93562f811e40..0055e3f81a92 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e11dd113cbc2..ffaad2017fff 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ 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/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 350b970a945d..f84d9d21f9cf 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 d57f881929e2..05a0b2fdacc9 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e3a6bf686e3c..6cf3f0ec9582 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -77,10 +72,8 @@ 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 195878eda8fa..e9fa368f7e5e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1d18853e2e2e..abeb9594e476 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 2052979417f7..8cd0c20a71c9 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,17 +32,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -83,7 +79,6 @@ 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 b03a4f653297..8d25a87c9c9c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1d6bae89fcdf..db7d8fe8b484 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d3d626a4f1ba..e4d5efd1db0b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 808132e8b525..01b9ddbe8d7c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0c2083bc7dee..8a3b896dbb97 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 07f79932b35c..85967f9e6df4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 affdf6c95811..92aad3dca4d9 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,91 +27,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3937b4be3e83..780016597836 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14c946e79f89..4d7bc9d2cd7e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8446d9313251..57935b018396 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b893bb4ec7c6..c3a8d46a2eba 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 58cef91c05f9..1ba709922615 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 32f8cefee8e0..3cf52be09aff 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 02b49f9390c0..12d8b2dd8680 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4fa06b4dd21b..34cd1d0a8987 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e301cd61dba3..d59b297318fa 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,7 +3,6 @@ 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,7 +37,6 @@ 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 557c82088717..22b52d28adf0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3b7cdb677828..fb35e1e2bcb2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bf82c3edbd20..272e46368765 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f55a0364cdd8..78072e14c990 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7206109c7d20..819aeec7a44c 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,7 +3,6 @@ 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,7 +67,6 @@ 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 f76eec0f4aa4..1dbd505badcb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b35debc9fe14..b67d9c5afaac 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,7 +3,6 @@ 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,7 +34,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5c51fa54cc0a..2dfd17aa2690 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1931d0ee7cd0..a289d93db4e9 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 970c6a6d06d1..d37dc45bb056 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b021a9d4e456..1ce2cf86a595 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index af2b07f95d73..47650e48a8d1 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 f55f17cc56c7..1de67f7c0d3f 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e214b9a22a55..b7c106960439 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 5263a4e2bc96..4f4d9b5821bb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +61,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,7 +137,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -177,10 +174,8 @@ 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 a451866b8b42..353093dd0728 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b314f4c2fa55..bf0ddb1209d2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 18101da678fa..a6302f7c15c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cab79bbdd7de..9c9a31829b61 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a1ca411799d9..6098f5f5c7e7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6325f452fa3..eb27dd2f2854 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 c8789eabac80..e399a462a232 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5e0afafe3770..3013c106da9c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0d4be7ac8140..6f3aeed1db4f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ 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/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index f93832a65c98..d9edf72050f1 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 41ad288217eb..0390e8d4d1ff 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 77d035a18c6f..20c1058e1c1e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 054320f31690..dbb746cdd42d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2300afd143a4..0e20fd2c2156 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,7 +3,6 @@ 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,10 +70,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 0ce2b93a2b0f..4e1818acd0ba 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 f0364f51c6e0..49fc8522cb61 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b33e49d5fdca..1d58f2e9ee4a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e13804a7a1a7..97b51b0d19be 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f51104c163d7..c012011c1225 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 81ed0e519fbf..36f6c923d9f7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 146f36a6e6a7..7fc03feb74bb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6e5ee477df6..8003bf2ed10f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 457dd9ab011f..6e01176c858a 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -24,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -45,7 +40,6 @@ public CategoryDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -66,7 +60,6 @@ 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 2bec6c231fc2..16d8830ad6ef 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -30,17 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +74,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -103,7 +96,6 @@ public PetDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -124,7 +116,6 @@ public PetDto category(@Nullable CategoryDto category) { return category; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(@Nullable CategoryDto category) { this.category = category; @@ -201,7 +192,6 @@ public List getTags() { return tags; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List tags) { this.tags = tags; @@ -227,7 +217,6 @@ 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 453c993f1953..aea153b010ce 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -24,10 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -45,7 +40,6 @@ public TagDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -66,7 +60,6 @@ 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 3c7ce4545e27..d856ddfb89fa 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14b412c88e43..6838b73d9dd2 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb214041a183..2d61f0549ab1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0cd4c4edbd58..a68df6caa20f 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,7 +2,6 @@ import java.net.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,37 +28,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 b214aaec6716..b735cd0533f6 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 af3f8b4cf7f3..ad35b01b1bee 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 618ea195e964..c902dbffa201 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f683525f4593..7b4148dffa45 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 282ca2ce689b..b89151fc0328 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,7 +3,6 @@ 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,7 +37,6 @@ 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 1efee220f79c..cf8455ed01ec 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e11670fd8583..7626e5d8202a 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 12bba4684f17..292ea37fa0f2 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,7 +2,6 @@ import java.net.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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6b56b13145d3..b771061ee3f4 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,7 +3,6 @@ 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,7 +66,6 @@ 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 8716cdb5a027..c3b7e41d404c 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9d2d4f85717e..b487150af485 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,7 +3,6 @@ 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,7 +34,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6778a62dfd5e..90080cef8e2d 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2479364db7a7..b7b216bd0236 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,7 +3,6 @@ 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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fc163e21c3ef..d633e777344e 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 55e771ca467d..90c95cef8ea3 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 16f74d8223aa..7c343ea96b27 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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; @@ -27,14 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 87dcca204cf9..3d0180f01192 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,7 +3,6 @@ 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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a2944244688e..8790dbd02f58 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -99,7 +97,6 @@ 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 54c2c98f7fe4..b010f75437cf 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -178,10 +175,8 @@ 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 84a803012fbc..4a3d777136d9 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 81c9051dedbc..b84d2b2d65db 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,7 +2,6 @@ import java.net.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,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c2dc9d17f0b8..7007dae14520 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6e7692c14ae3..58b6d6e76f5e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a1efb10089a8..6bb6c1aed323 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -63,13 +61,10 @@ 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 1fb2d7e1681f..dcba61d10b27 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,7 +2,6 @@ import java.net.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,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 18ba5e0817d1..9a6def1673a7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 99dd4cb2346a..7122baa8ced0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6a301e90066d..6e6fd553311c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ba61ceca8a5f..87e36f32f3e9 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 07be2f99663a..d3c90dbae169 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +23,10 @@ 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/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index 3abb813498f2..dff5aa4523f8 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 5101f61ad25b..23e94dfe3ce0 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,7 +2,6 @@ import java.net.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 94ca262ac9d5..290d9fe2c833 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -75,10 +70,8 @@ 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 e25f604bf796..510f8ad776a9 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,7 +2,6 @@ import java.net.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,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 79e274840817..a4b4ca303fe5 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,7 +3,6 @@ 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,10 +70,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 be762175a56b..f54dcf1785b1 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -81,7 +77,6 @@ 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 70d56774fa5c..c9ee65de0da6 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 42f5ebb3fa30..1c7b5af1c5b5 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 57fc0a0a7414..ae49a208c813 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 82ac9d8ad4bd..9147a7f99437 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 beb8249ba62a..a14a5445fa58 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8f0711631a8c..0da0151b20f7 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,7 +2,6 @@ import java.net.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,91 +25,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e960421a7b2e..9c4beba4c0b5 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0cffd89751f9..b83621e3c5c5 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7ea192986d4b..0386839d7e65 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 120027d72686..2c0ea1e64719 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,7 +2,6 @@ import java.net.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,37 +27,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 c86f74b0f1e5..a9a6302ca222 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5ed04a539f34..9f17a2283e15 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2876505e1ca9..359b80444763 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e8d36bc80c75..19de8e523b88 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f5d220bc1b43..dd595f439b98 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,7 +3,6 @@ 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,7 +36,6 @@ 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 cb11751ae30d..00774785274e 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,7 +2,6 @@ import java.net.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4753f3aac27..755f93d5edff 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,7 +2,6 @@ import java.net.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7a515da44b10..05cd27a19455 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,7 +2,6 @@ import java.net.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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ccf15a03d444..09192bf258ce 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,7 +3,6 @@ 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,7 +65,6 @@ 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 92061bc6c11c..1fec8e311e94 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +20,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14b7e59f604d..b69226e8f6d4 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,7 +3,6 @@ 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,7 +33,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bcd733ba06d7..765b47c02930 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68a2012819e0..582981a9138b 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40e0c7d71b19..87058382ca6a 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 da56b8e5ac2c..6f82a123ec9b 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a348b064c179..4a739b2a500c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 0b2f171a2c81..7df35b5581f7 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,7 +3,6 @@ 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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 dddcfc03ff99..2f8c2b3e34a4 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,7 +96,6 @@ 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 c62cf18d0eee..7c7d44cc8cf4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +61,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,7 +137,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -177,10 +174,8 @@ 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 b04070c5895c..440dbb1eed22 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a35c6f92fc61..7869c8d9f087 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,7 +2,6 @@ import java.net.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,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c0831401197a..c1c5c8e43024 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5cfebe0f0330..d4f48136cd24 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f051906c8fa6..d9bb5b2251fc 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,13 +60,10 @@ 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 16bfe9107739..3cc4a34993e2 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,7 +2,6 @@ import java.net.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,14 +26,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d4213ff3ec76..625aaa685333 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f450a55105cd..174656b8beb7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fc38b804638a..100731ee348e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5efb23330e2c..ce019ef96625 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f237f6637dd5..01239ad1825e 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +22,10 @@ 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/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index d5fda5613396..5e0395f3fd34 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -26,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 1fe9d565f928..22da19e4462b 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,7 +2,6 @@ import java.net.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 15aa52365118..d9aed984c327 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +69,8 @@ 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 5453a6b4f052..7e270ad6e0b9 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,7 +2,6 @@ import java.net.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,13 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40350659ae78..aaeca7c426ec 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,7 +3,6 @@ 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,10 +69,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 89685de90050..f6cf21bbef92 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 74c2b0d529b4..9f4d986e0e24 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 71106ba573b9..d1ebb58dbd72 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,7 +2,6 @@ import java.net.URI; import java.util.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 +20,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d009a7a1faa0..c5738d0b4c35 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 db9486dc1ab4..abe6da736d2c 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 25e08a524514..a4c48f51d92b 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +20,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 058a67331ca7..3c7d8238f334 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,7 +2,6 @@ import java.net.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,91 +24,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e960421a7b2e..9c4beba4c0b5 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0cffd89751f9..b83621e3c5c5 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7ea192986d4b..0386839d7e65 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 120027d72686..2c0ea1e64719 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,7 +2,6 @@ import java.net.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,37 +27,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 c86f74b0f1e5..a9a6302ca222 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5ed04a539f34..9f17a2283e15 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2876505e1ca9..359b80444763 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,7 +2,6 @@ import java.net.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e8d36bc80c75..19de8e523b88 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f5d220bc1b43..dd595f439b98 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,7 +3,6 @@ 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,7 +36,6 @@ 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 cb11751ae30d..00774785274e 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,7 +2,6 @@ import java.net.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4753f3aac27..755f93d5edff 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,7 +2,6 @@ import java.net.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7a515da44b10..05cd27a19455 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,7 +2,6 @@ import java.net.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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ccf15a03d444..09192bf258ce 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,7 +3,6 @@ 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,7 +65,6 @@ 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 92061bc6c11c..1fec8e311e94 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +20,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14b7e59f604d..b69226e8f6d4 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,7 +3,6 @@ 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,7 +33,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bcd733ba06d7..765b47c02930 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68a2012819e0..582981a9138b 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40e0c7d71b19..87058382ca6a 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 da56b8e5ac2c..6f82a123ec9b 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index a348b064c179..4a739b2a500c 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 0b2f171a2c81..7df35b5581f7 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,7 +3,6 @@ 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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 dddcfc03ff99..2f8c2b3e34a4 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -98,7 +96,6 @@ 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 c62cf18d0eee..7c7d44cc8cf4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +61,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,7 +137,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -177,10 +174,8 @@ 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 b04070c5895c..440dbb1eed22 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +20,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a35c6f92fc61..7869c8d9f087 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,7 +2,6 @@ import java.net.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,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c0831401197a..c1c5c8e43024 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5cfebe0f0330..d4f48136cd24 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f051906c8fa6..d9bb5b2251fc 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,13 +60,10 @@ 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 16bfe9107739..3cc4a34993e2 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,7 +2,6 @@ import java.net.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,14 +26,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d4213ff3ec76..625aaa685333 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f450a55105cd..174656b8beb7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fc38b804638a..100731ee348e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5efb23330e2c..ce019ef96625 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f237f6637dd5..01239ad1825e 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +22,10 @@ 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/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index d5fda5613396..5e0395f3fd34 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -26,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 1fe9d565f928..22da19e4462b 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,7 +2,6 @@ import java.net.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 15aa52365118..d9aed984c327 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +69,8 @@ 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 5453a6b4f052..7e270ad6e0b9 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,7 +2,6 @@ import java.net.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,13 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40350659ae78..aaeca7c426ec 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,7 +3,6 @@ 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,10 +69,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 89685de90050..f6cf21bbef92 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 74c2b0d529b4..9f4d986e0e24 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 71106ba573b9..d1ebb58dbd72 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,7 +2,6 @@ import java.net.URI; import java.util.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 +20,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d009a7a1faa0..c5738d0b4c35 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 db9486dc1ab4..abe6da736d2c 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 25e08a524514..a4c48f51d92b 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +20,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 058a67331ca7..3c7d8238f334 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,7 +2,6 @@ import java.net.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,91 +24,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1cb856bede0d..bc9bceb063b8 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 0676ea4382d6..981cec3ab093 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -31,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String name) { @@ -49,7 +45,6 @@ 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 2241c7d959f3..365dc34333fd 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 2ea6bd2cd002..df78eacb128d 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,36 +27,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -85,7 +72,6 @@ public Map getMapString() { return mapString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_string") public void setMapString(Map mapString) { this.mapString = mapString; @@ -114,7 +100,6 @@ public Map getMapNumber() { return mapNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_number") public void setMapNumber(Map mapNumber) { this.mapNumber = mapNumber; @@ -143,7 +128,6 @@ public Map getMapInteger() { return mapInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_integer") public void setMapInteger(Map mapInteger) { this.mapInteger = mapInteger; @@ -172,7 +156,6 @@ public Map getMapBoolean() { return mapBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_boolean") public void setMapBoolean(Map mapBoolean) { this.mapBoolean = mapBoolean; @@ -201,7 +184,6 @@ public Map> getMapArrayInteger() { return mapArrayInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_integer") public void setMapArrayInteger(Map> mapArrayInteger) { this.mapArrayInteger = mapArrayInteger; @@ -230,7 +212,6 @@ public Map> getMapArrayAnytype() { return mapArrayAnytype; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_anytype") public void setMapArrayAnytype(Map> mapArrayAnytype) { this.mapArrayAnytype = mapArrayAnytype; @@ -259,7 +240,6 @@ public Map> getMapMapString() { return mapMapString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_string") public void setMapMapString(Map> mapMapString) { this.mapMapString = mapMapString; @@ -288,7 +268,6 @@ public Map> getMapMapAnytype() { return mapMapAnytype; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_anytype") public void setMapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; @@ -309,7 +288,6 @@ public AdditionalPropertiesClassDto anytype1(@Nullable Object anytype1) { return anytype1; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("anytype_1") public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; @@ -350,7 +328,6 @@ 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 b316d3c81cda..bffa29295750 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 d5cc7439d547..183e40479a62 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -31,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String name) { @@ -49,7 +45,6 @@ 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 5ba2d44f1289..d22956854bdc 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -31,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String name) { @@ -49,7 +45,6 @@ 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 1d2c057c67f8..e9ef30b6d856 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesStringDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 79eb758c01f0..f052d224f99f 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,14 +3,11 @@ 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; @@ -41,7 +38,6 @@ public class AnimalDto { private String className; - @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public AnimalDto() { @@ -83,7 +79,6 @@ 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 816907e58b6a..f8e1337a4ab9 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -50,7 +44,6 @@ public ApiResponseDto code(@Nullable Integer code) { return code; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") public void setCode(@Nullable Integer code) { this.code = code; @@ -71,7 +64,6 @@ public ApiResponseDto type(@Nullable String type) { return type; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(@Nullable String type) { this.type = type; @@ -92,7 +84,6 @@ 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 fa600276dd17..3c2e36d290e5 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> arrayArrayNumber) { @@ -56,7 +52,6 @@ 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 59a9a5cf1f8f..8df81da118a1 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List arrayNumber) { @@ -56,7 +52,6 @@ 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 9d892b04ccdb..aac3d40b5291 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,13 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -62,7 +56,6 @@ public List getArrayOfString() { return arrayOfString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_of_string") public void setArrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; @@ -91,7 +84,6 @@ public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_array_of_integer") public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { this.arrayArrayOfInteger = arrayArrayOfInteger; @@ -120,7 +112,6 @@ 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 d6dbc67f2d23..58f86163cbad 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,15 +3,12 @@ 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; @@ -71,7 +68,6 @@ public static KindEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCatDto() { @@ -93,7 +89,6 @@ 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 3e334c63cc44..74e40bf70cb2 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,22 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -59,7 +50,6 @@ public CapitalizationDto smallCamel(@Nullable String smallCamel) { return smallCamel; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("smallCamel") public void setSmallCamel(@Nullable String smallCamel) { this.smallCamel = smallCamel; @@ -80,7 +70,6 @@ public CapitalizationDto capitalCamel(@Nullable String capitalCamel) { return capitalCamel; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("CapitalCamel") public void setCapitalCamel(@Nullable String capitalCamel) { this.capitalCamel = capitalCamel; @@ -101,7 +90,6 @@ public CapitalizationDto smallSnake(@Nullable String smallSnake) { return smallSnake; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("small_Snake") public void setSmallSnake(@Nullable String smallSnake) { this.smallSnake = smallSnake; @@ -122,7 +110,6 @@ public CapitalizationDto capitalSnake(@Nullable String capitalSnake) { return capitalSnake; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("Capital_Snake") public void setCapitalSnake(@Nullable String capitalSnake) { this.capitalSnake = capitalSnake; @@ -143,7 +130,6 @@ 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; @@ -164,7 +150,6 @@ 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 cdad439483f3..2c3ca34c64b8 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,14 +3,11 @@ 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; @@ -38,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CatDto extends AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public CatDto() { @@ -60,7 +56,6 @@ 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 a7974b8569f2..2338ce3f1430 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; @@ -50,7 +46,6 @@ 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 f51abf8ece42..0a8721d2304b 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,15 +3,12 @@ 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; @@ -32,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String otherProperty) { @@ -50,7 +46,6 @@ 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 224945aa2097..c779c49bdd99 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ClassModelDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String propertyClass) { @@ -44,7 +40,6 @@ 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 d56f7d0b101d..2cb41758dc8e 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ClientDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public ClientDto client(@Nullable String client) { @@ -44,7 +40,6 @@ 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 24cf4c298157..ec0f2957181f 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,14 +3,11 @@ 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; @@ -31,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class DogDto extends AnimalDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public DogDto() { @@ -53,7 +49,6 @@ 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 77c896e6f7bb..b37c52c60201 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -65,7 +62,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -103,7 +99,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { @@ -121,7 +116,6 @@ public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { return justSymbol; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("just_symbol") public void setJustSymbol(@Nullable JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; @@ -150,7 +144,6 @@ 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 f94de0c9c545..0654af44be82 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -65,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -142,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -180,10 +175,8 @@ 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() { @@ -205,7 +198,6 @@ public EnumTestDto enumString(@Nullable EnumStringEnum enumString) { return enumString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_string") public void setEnumString(@Nullable EnumStringEnum enumString) { this.enumString = enumString; @@ -246,7 +238,6 @@ public EnumTestDto enumInteger(@Nullable EnumIntegerEnum enumInteger) { return enumInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_integer") public void setEnumInteger(@Nullable EnumIntegerEnum enumInteger) { this.enumInteger = enumInteger; @@ -267,7 +258,6 @@ public EnumTestDto enumNumber(@Nullable EnumNumberEnum enumNumber) { return enumNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_number") public void setEnumNumber(@Nullable EnumNumberEnum enumNumber) { this.enumNumber = enumNumber; @@ -288,7 +278,6 @@ 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 8d754b6d329e..2c8f7e4ab072 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String sourceURI) { @@ -44,7 +40,6 @@ 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 e64265eb2f4c..66defbf33514 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,10 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -51,7 +46,6 @@ public FileSchemaTestClassDto file(@Nullable FileDto file) { return file; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("file") public void setFile(@Nullable FileDto file) { this.file = file; @@ -80,7 +74,6 @@ 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 e6c0613fa656..9558d457cb1e 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -32,44 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -93,7 +80,6 @@ public FormatTestDto integer(@Nullable Integer integer) { return integer; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("integer") public void setInteger(@Nullable Integer integer) { this.integer = integer; @@ -116,7 +102,6 @@ public FormatTestDto int32(@Nullable Integer int32) { return int32; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int32") public void setInt32(@Nullable Integer int32) { this.int32 = int32; @@ -137,7 +122,6 @@ public FormatTestDto int64(@Nullable Long int64) { return int64; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int64") public void setInt64(@Nullable Long int64) { this.int64 = int64; @@ -182,7 +166,6 @@ public FormatTestDto _float(@Nullable Float _float) { return _float; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("float") public void setFloat(@Nullable Float _float) { this._float = _float; @@ -205,7 +188,6 @@ public FormatTestDto _double(@Nullable Double _double) { return _double; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("double") public void setDouble(@Nullable Double _double) { this._double = _double; @@ -226,7 +208,6 @@ public FormatTestDto string(@Nullable String string) { return string; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("string") public void setString(@Nullable String string) { this.string = string; @@ -267,7 +248,6 @@ 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; @@ -308,7 +288,6 @@ public FormatTestDto dateTime(@Nullable OffsetDateTime dateTime) { return dateTime; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -329,7 +308,6 @@ public FormatTestDto uuid(@Nullable UUID uuid) { return uuid; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -370,7 +348,6 @@ 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 7f1ec148d734..8f53bf0c3643 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -47,7 +42,6 @@ public HasOnlyReadOnlyDto bar(@Nullable String bar) { return bar; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -68,7 +62,6 @@ 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 f81d7e91fa7a..ac54df166790 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ListDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ListDto _123list(@Nullable String _123list) { @@ -44,7 +40,6 @@ 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 09940c4522d0..1894246433e9 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -29,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -67,13 +63,10 @@ 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) { @@ -99,7 +92,6 @@ public Map> getMapMapOfString() { return mapMapOfString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_of_string") public void setMapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; @@ -128,7 +120,6 @@ public Map getMapOfEnumString() { return mapOfEnumString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_of_enum_string") public void setMapOfEnumString(Map mapOfEnumString) { this.mapOfEnumString = mapOfEnumString; @@ -157,7 +148,6 @@ public Map getDirectMap() { return directMap; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("direct_map") public void setDirectMap(Map directMap) { this.directMap = directMap; @@ -186,7 +176,6 @@ 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 e3ffa8984cf9..6077b0b38c7c 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -32,14 +29,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -57,7 +51,6 @@ public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) return uuid; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -78,7 +71,6 @@ public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(@Nullable OffsetD return dateTime; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -107,7 +99,6 @@ 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 68ab43312e9a..8edaa25804e5 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -47,7 +42,6 @@ public Model200ResponseDto name(@Nullable Integer name) { return name; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable Integer name) { this.name = name; @@ -68,7 +62,6 @@ 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 809f87f431c2..9fbcdb2a7def 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -28,13 +25,10 @@ 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() { @@ -76,7 +70,6 @@ public NameDto snakeCase(@Nullable Integer snakeCase) { return snakeCase; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("snake_case") public void setSnakeCase(@Nullable Integer snakeCase) { this.snakeCase = snakeCase; @@ -97,7 +90,6 @@ public NameDto property(@Nullable String property) { return property; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("property") public void setProperty(@Nullable String property) { this.property = property; @@ -118,7 +110,6 @@ 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 38d2fe30ad04..75633c719667 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -27,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NumberOnlyDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal justNumber) { @@ -45,7 +41,6 @@ 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 10749eefcf28..c0fdbfb69ff4 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -29,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -79,10 +72,8 @@ 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) { @@ -100,7 +91,6 @@ public OrderDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -121,7 +111,6 @@ public OrderDto petId(@Nullable Long petId) { return petId; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") public void setPetId(@Nullable Long petId) { this.petId = petId; @@ -142,7 +131,6 @@ public OrderDto quantity(@Nullable Integer quantity) { return quantity; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") public void setQuantity(@Nullable Integer quantity) { this.quantity = quantity; @@ -163,7 +151,6 @@ public OrderDto shipDate(@Nullable OffsetDateTime shipDate) { return shipDate; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") public void setShipDate(@Nullable OffsetDateTime shipDate) { this.shipDate = shipDate; @@ -184,7 +171,6 @@ public OrderDto status(@Nullable StatusEnum status) { return status; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { this.status = status; @@ -205,7 +191,6 @@ 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 ef36d8f2150d..e3353d6b0464 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -27,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -51,7 +45,6 @@ public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { return myNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_number") public void setMyNumber(@Nullable BigDecimal myNumber) { this.myNumber = myNumber; @@ -72,7 +65,6 @@ public OuterCompositeDto myString(@Nullable String myString) { return myString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_string") public void setMyString(@Nullable String myString) { this.myString = myString; @@ -93,7 +85,6 @@ 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 624aa64de1f3..83e19df5a8c2 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,15 +3,12 @@ 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; @@ -71,7 +68,6 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private @Nullable String nullableProperty = null; @@ -91,7 +87,6 @@ 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 30524a3fe8d0..1af5c0127668 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -35,17 +32,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -85,7 +79,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -108,7 +101,6 @@ public PetDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -129,7 +121,6 @@ public PetDto category(@Nullable CategoryDto category) { return category; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(@Nullable CategoryDto category) { this.category = category; @@ -207,7 +198,6 @@ public PetDto addTagsItem(TagDto tagsItem) { return tags; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List<@Valid TagDto> tags) { this.tags = tags; @@ -233,7 +223,6 @@ 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 d2e84b1d47e6..db0766501e6a 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -47,7 +42,6 @@ public ReadOnlyFirstDto bar(@Nullable String bar) { return bar; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -68,7 +62,6 @@ 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 faa3512a89df..53d95b70a2d2 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -53,7 +46,6 @@ public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable Str return normalPropertyName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("normalPropertyName") public void setNormalPropertyName(@Nullable String normalPropertyName) { this.normalPropertyName = normalPropertyName; @@ -74,7 +66,6 @@ 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; @@ -95,7 +86,6 @@ public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(@Nullabl return lowerCasePropertyDashes; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lower-case-property-dashes") public void setLowerCasePropertyDashes(@Nullable String lowerCasePropertyDashes) { this.lowerCasePropertyDashes = lowerCasePropertyDashes; @@ -116,7 +106,6 @@ 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 9d4d479f06ab..b4a996899f85 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ReturnDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _return) { @@ -44,7 +40,6 @@ 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 46736897a1ac..c9a8814f466b 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class SpecialModelNameDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(@Nullable Long $specialPropertyName) { @@ -44,7 +40,6 @@ 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 0580a3e0b343..778f22acdb37 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -47,7 +42,6 @@ public TagDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -68,7 +62,6 @@ 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 815716c0500e..1c62c7a686ef 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -65,7 +54,6 @@ public UserDto id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -86,7 +74,6 @@ public UserDto username(@Nullable String username) { return username; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") public void setUsername(@Nullable String username) { this.username = username; @@ -107,7 +94,6 @@ public UserDto firstName(@Nullable String firstName) { return firstName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") public void setFirstName(@Nullable String firstName) { this.firstName = firstName; @@ -128,7 +114,6 @@ public UserDto lastName(@Nullable String lastName) { return lastName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") public void setLastName(@Nullable String lastName) { this.lastName = lastName; @@ -149,7 +134,6 @@ public UserDto email(@Nullable String email) { return email; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") public void setEmail(@Nullable String email) { this.email = email; @@ -170,7 +154,6 @@ public UserDto password(@Nullable String password) { return password; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") public void setPassword(@Nullable String password) { this.password = password; @@ -191,7 +174,6 @@ public UserDto phone(@Nullable String phone) { return phone; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") public void setPhone(@Nullable String phone) { this.phone = phone; @@ -212,7 +194,6 @@ 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 d018521c12a3..2d5e2d7d5af6 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -30,91 +27,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -132,7 +100,6 @@ public XmlItemDto attributeString(@Nullable String attributeString) { return attributeString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_string") public void setAttributeString(@Nullable String attributeString) { this.attributeString = attributeString; @@ -153,7 +120,6 @@ public XmlItemDto attributeNumber(@Nullable BigDecimal attributeNumber) { return attributeNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_number") public void setAttributeNumber(@Nullable BigDecimal attributeNumber) { this.attributeNumber = attributeNumber; @@ -174,7 +140,6 @@ public XmlItemDto attributeInteger(@Nullable Integer attributeInteger) { return attributeInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_integer") public void setAttributeInteger(@Nullable Integer attributeInteger) { this.attributeInteger = attributeInteger; @@ -195,7 +160,6 @@ public XmlItemDto attributeBoolean(@Nullable Boolean attributeBoolean) { return attributeBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_boolean") public void setAttributeBoolean(@Nullable Boolean attributeBoolean) { this.attributeBoolean = attributeBoolean; @@ -224,7 +188,6 @@ public List getWrappedArray() { return wrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("wrapped_array") public void setWrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; @@ -245,7 +208,6 @@ public XmlItemDto nameString(@Nullable String nameString) { return nameString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_string") public void setNameString(@Nullable String nameString) { this.nameString = nameString; @@ -266,7 +228,6 @@ public XmlItemDto nameNumber(@Nullable BigDecimal nameNumber) { return nameNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_number") public void setNameNumber(@Nullable BigDecimal nameNumber) { this.nameNumber = nameNumber; @@ -287,7 +248,6 @@ public XmlItemDto nameInteger(@Nullable Integer nameInteger) { return nameInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_integer") public void setNameInteger(@Nullable Integer nameInteger) { this.nameInteger = nameInteger; @@ -308,7 +268,6 @@ public XmlItemDto nameBoolean(@Nullable Boolean nameBoolean) { return nameBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_boolean") public void setNameBoolean(@Nullable Boolean nameBoolean) { this.nameBoolean = nameBoolean; @@ -337,7 +296,6 @@ public List getNameArray() { return nameArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_array") public void setNameArray(List nameArray) { this.nameArray = nameArray; @@ -366,7 +324,6 @@ public List getNameWrappedArray() { return nameWrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_wrapped_array") public void setNameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; @@ -387,7 +344,6 @@ public XmlItemDto prefixString(@Nullable String prefixString) { return prefixString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_string") public void setPrefixString(@Nullable String prefixString) { this.prefixString = prefixString; @@ -408,7 +364,6 @@ public XmlItemDto prefixNumber(@Nullable BigDecimal prefixNumber) { return prefixNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_number") public void setPrefixNumber(@Nullable BigDecimal prefixNumber) { this.prefixNumber = prefixNumber; @@ -429,7 +384,6 @@ public XmlItemDto prefixInteger(@Nullable Integer prefixInteger) { return prefixInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_integer") public void setPrefixInteger(@Nullable Integer prefixInteger) { this.prefixInteger = prefixInteger; @@ -450,7 +404,6 @@ public XmlItemDto prefixBoolean(@Nullable Boolean prefixBoolean) { return prefixBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_boolean") public void setPrefixBoolean(@Nullable Boolean prefixBoolean) { this.prefixBoolean = prefixBoolean; @@ -479,7 +432,6 @@ public List getPrefixArray() { return prefixArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_array") public void setPrefixArray(List prefixArray) { this.prefixArray = prefixArray; @@ -508,7 +460,6 @@ public List getPrefixWrappedArray() { return prefixWrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_wrapped_array") public void setPrefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; @@ -529,7 +480,6 @@ public XmlItemDto namespaceString(@Nullable String namespaceString) { return namespaceString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_string") public void setNamespaceString(@Nullable String namespaceString) { this.namespaceString = namespaceString; @@ -550,7 +500,6 @@ public XmlItemDto namespaceNumber(@Nullable BigDecimal namespaceNumber) { return namespaceNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_number") public void setNamespaceNumber(@Nullable BigDecimal namespaceNumber) { this.namespaceNumber = namespaceNumber; @@ -571,7 +520,6 @@ public XmlItemDto namespaceInteger(@Nullable Integer namespaceInteger) { return namespaceInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_integer") public void setNamespaceInteger(@Nullable Integer namespaceInteger) { this.namespaceInteger = namespaceInteger; @@ -592,7 +540,6 @@ public XmlItemDto namespaceBoolean(@Nullable Boolean namespaceBoolean) { return namespaceBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_boolean") public void setNamespaceBoolean(@Nullable Boolean namespaceBoolean) { this.namespaceBoolean = namespaceBoolean; @@ -621,7 +568,6 @@ public List getNamespaceArray() { return namespaceArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_array") public void setNamespaceArray(List namespaceArray) { this.namespaceArray = namespaceArray; @@ -650,7 +596,6 @@ public List getNamespaceWrappedArray() { return namespaceWrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_wrapped_array") public void setNamespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; @@ -671,7 +616,6 @@ 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; @@ -692,7 +636,6 @@ 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; @@ -713,7 +656,6 @@ 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; @@ -734,7 +676,6 @@ 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; @@ -763,7 +704,6 @@ public List getPrefixNsArray() { return prefixNsArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_array") public void setPrefixNsArray(List prefixNsArray) { this.prefixNsArray = prefixNsArray; @@ -792,7 +732,6 @@ 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 124842816779..0d805693483a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4f84cb935113..f6e19548507d 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fbf2aed4574b..d609a8a93d2f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5daca86cbb74..7776dc10e551 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 45cf0b07ea5c..a4ac3b11d1d8 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 afa798720a53..8563990118de 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 65a68c9903a5..25a1633f222d 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b6fe3c7b55d4..3065ea27bffb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e8e804a79d3..f5f66f38664f 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,7 +3,6 @@ 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,7 +38,6 @@ 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 2f035d99c5cb..5be58e0f7e29 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0f421a4df7e0..4673fcfb44c0 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 554b15ab3cf0..a1af40c03a26 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c2a8c6f3157a..11a62056d0b4 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,7 +3,6 @@ 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,7 +67,6 @@ 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 0c782403899d..6e1739acb5c2 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 41de3f00a15f..514eaf8f4542 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 08c3a1d9091a..5c12a6ef13a0 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b75f13dec63d..1ec5151968d1 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4a5b229735a..5e19fd32b228 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ab82f0b7875a..2537e7860263 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 09216052292e..7d10b0d2be3a 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 f5c6d012b5d5..7516ed27426e 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c5e33007e200..65e6de5132b3 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 bab57721b404..89f556d62e0a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 9bbef1dd181a..a04bdd0a513e 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0eee22443042..34e36d2ed07d 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6c85cd100777..2e5407a84750 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 32ff5875653f..23d9b5b230ef 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 00158afc58e2..8879d27b85a2 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 b815102e433a..952d468df1fa 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0e06b0996d7d..e7a0b038f219 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a7e8a5527796..9621a403daba 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 42912f6c62d2..46140cddd75d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a9ec3b39d649..e9321a52ab25 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9b15554afbc6..e1dbfae7b478 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +24,10 @@ 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/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java index d606c62a8fcf..c25a2eaa55bf 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 da0887c1a0a4..492a15cb3251 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5ae7eff7c3dc..8ece8c404d47 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 3649750a3036..ed9620ca1178 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d6a067cca4e5..fd22481c46c1 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 f4272d0f6c80..549fb440b002 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 1dbcb6377ed3..bc23fb787551 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d0cd713d9077..e89eb222e74f 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 dc585124df1c..84db15fc2c0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0519c3ba63a0..f6f20d7abff8 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 145a59fb7768..295a51d10519 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8edad109831f..7f383201e0da 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3937b4be3e83..780016597836 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14c946e79f89..4d7bc9d2cd7e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8446d9313251..57935b018396 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b893bb4ec7c6..c3a8d46a2eba 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 58cef91c05f9..1ba709922615 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 32f8cefee8e0..3cf52be09aff 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 02b49f9390c0..12d8b2dd8680 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4fa06b4dd21b..34cd1d0a8987 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e301cd61dba3..d59b297318fa 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,7 +3,6 @@ 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,7 +37,6 @@ 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 557c82088717..22b52d28adf0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3b7cdb677828..fb35e1e2bcb2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bf82c3edbd20..272e46368765 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f55a0364cdd8..78072e14c990 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7206109c7d20..819aeec7a44c 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,7 +3,6 @@ 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,7 +67,6 @@ 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 f76eec0f4aa4..1dbd505badcb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b35debc9fe14..b67d9c5afaac 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,7 +3,6 @@ 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,7 +34,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5c51fa54cc0a..2dfd17aa2690 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1931d0ee7cd0..a289d93db4e9 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 970c6a6d06d1..d37dc45bb056 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b021a9d4e456..1ce2cf86a595 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index af2b07f95d73..47650e48a8d1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 f55f17cc56c7..1de67f7c0d3f 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e214b9a22a55..b7c106960439 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 5263a4e2bc96..4f4d9b5821bb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +61,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -139,7 +137,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -177,10 +174,8 @@ 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 a451866b8b42..353093dd0728 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b314f4c2fa55..bf0ddb1209d2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 18101da678fa..a6302f7c15c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +28,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cab79bbdd7de..9c9a31829b61 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a1ca411799d9..6098f5f5c7e7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6325f452fa3..eb27dd2f2854 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 c8789eabac80..e399a462a232 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5e0afafe3770..3013c106da9c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0d4be7ac8140..6f3aeed1db4f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ 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/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index f93832a65c98..d9edf72050f1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 41ad288217eb..0390e8d4d1ff 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 77d035a18c6f..20c1058e1c1e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 054320f31690..dbb746cdd42d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2300afd143a4..0e20fd2c2156 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,7 +3,6 @@ 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,10 +70,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 0ce2b93a2b0f..4e1818acd0ba 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 f0364f51c6e0..49fc8522cb61 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b33e49d5fdca..1d58f2e9ee4a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e13804a7a1a7..97b51b0d19be 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f51104c163d7..c012011c1225 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 81ed0e519fbf..36f6c923d9f7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 146f36a6e6a7..7fc03feb74bb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6e5ee477df6..8003bf2ed10f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 785088a60070..32fa83771633 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 97f67087df1b..6c5858f8d968 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c0d85125abc2..b707d0febbd0 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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(); @@ -75,10 +70,8 @@ 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 819444909ebb..408d4b29d750 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -78,7 +74,6 @@ 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 3d3b2de5b80a..8ed3a6fe6453 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c24c06fe7563..e255ce433c6d 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 379ef08836f8..039b852ec2ad 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -23,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -44,7 +39,6 @@ public Long getId() { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -65,7 +59,6 @@ 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 1822b26b00b8..559c232f90a7 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,12 +2,9 @@ import java.net.URI; import java.util.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,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -49,7 +43,6 @@ public Integer getCode() { return code; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") public void setCode(Integer code) { this.code = code; @@ -70,7 +63,6 @@ public String getType() { return type; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(String type) { this.type = type; @@ -91,7 +83,6 @@ 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 cd1bb401520a..4b65be0912e7 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,16 +23,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +69,8 @@ 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) { @@ -97,7 +88,6 @@ public Long getId() { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -118,7 +108,6 @@ public Long getPetId() { return petId; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") public void setPetId(Long petId) { this.petId = petId; @@ -139,7 +128,6 @@ public Integer getQuantity() { return quantity; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") public void setQuantity(Integer quantity) { this.quantity = quantity; @@ -160,7 +148,6 @@ public OffsetDateTime getShipDate() { return shipDate; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") public void setShipDate(OffsetDateTime shipDate) { this.shipDate = shipDate; @@ -181,7 +168,6 @@ public StatusEnum getStatus() { return status; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") public void setStatus(StatusEnum status) { this.status = status; @@ -202,7 +188,6 @@ 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 e7ed1e26b8fa..e14fd7d391ed 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -29,17 +26,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -79,7 +73,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private StatusEnum status; @@ -110,7 +103,6 @@ public Long getId() { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -131,7 +123,6 @@ public Category getCategory() { return category; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(Category category) { this.category = category; @@ -208,7 +199,6 @@ public Pet addTagsItem(Tag tagsItem) { return tags; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List<@Valid Tag> tags) { this.tags = tags; @@ -234,7 +224,6 @@ 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 3a5389dc75b8..14dd1e106aab 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -23,10 +20,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -44,7 +39,6 @@ public Long getId() { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -65,7 +59,6 @@ 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 d7384260b257..dd50584c870e 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -23,28 +20,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -62,7 +51,6 @@ public Long getId() { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(Long id) { this.id = id; @@ -83,7 +71,6 @@ public String getUsername() { return username; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") public void setUsername(String username) { this.username = username; @@ -104,7 +91,6 @@ public String getFirstName() { return firstName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") public void setFirstName(String firstName) { this.firstName = firstName; @@ -125,7 +111,6 @@ public String getLastName() { return lastName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") public void setLastName(String lastName) { this.lastName = lastName; @@ -146,7 +131,6 @@ public String getEmail() { return email; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") public void setEmail(String email) { this.email = email; @@ -167,7 +151,6 @@ public String getPassword() { return password; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") public void setPassword(String password) { this.password = password; @@ -188,7 +171,6 @@ public String getPhone() { return phone; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") public void setPhone(String phone) { this.phone = phone; @@ -209,7 +191,6 @@ 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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4aa4e0f36117..bf8f8eb792e3 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,7 +2,6 @@ import java.net.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; @@ -31,27 +30,20 @@ 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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d5f2df7bca2b..410297196310 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a5a825b810a7..02d4683c376d 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6f460b1efe0f..c8e4a12db550 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 212def45ba53..a92b5ee15ce7 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 9fcdefe1da2e..5d3bc987a57f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 3143a254184d..b8c138a26f3b 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 aeb76fdcd3b2..97b4b746044f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 526aa66a1882..fe35f16720f1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 87c1af437ed4..21ce083867e4 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 ab6a00effad0..cbc80297f977 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1268109b1c52..28e0b05c9442 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 f655d26b20a7..d50008b0cc77 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9d2869a9bc9f..ffa017475297 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 26f65cfc2849..a6310e32c005 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,7 +2,6 @@ import java.net.URI; 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 93a0bdb89f2a..82cc612e6cae 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,7 +3,6 @@ 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,13 +30,10 @@ 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 1a62a9ca8026..9bf046ea7ad1 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,7 +3,6 @@ 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,13 +30,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68e2156bfe37..9d13a5fe1c43 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,7 +3,6 @@ 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 c0c83681e122..4d5f5eb27b51 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,7 +3,6 @@ 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 9c8ba78f46c0..11730ebb0153 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6474eab33c57..9e3c0ce9d02d 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6bff315d94c..a0d49d52576b 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,7 +3,6 @@ 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; @@ -40,16 +39,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c3e7425d99a4..27520d6ec8e9 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,7 +3,6 @@ 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,24 +35,18 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6b1a418efa4e..f7ffa9174955 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d2bc6b716ab6..ebbeffd71d45 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,7 +3,6 @@ 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,10 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fcb066d95f00..f5394195b4f1 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9d9fa8b05fa6..13282587b94b 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,7 +3,6 @@ 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 9c1dda282524..97359af0597e 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4de940447fa0..f63e05e354a0 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,7 +3,6 @@ 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,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6c2cba0c20f..3590e03ae8a1 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 594f2dca0200..87870ad8194c 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6e8356747357..77c26035a11c 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,7 +2,6 @@ import java.net.URI; 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 c27bcfa659c7..a7a77e4720f9 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,7 +3,6 @@ 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,13 +30,10 @@ 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 55d900764ed0..3fe89b2ba217 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,7 +3,6 @@ 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,13 +30,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1ca4f8aaf942..59e3888f7321 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,7 +3,6 @@ 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 3f5d373fb32e..f71cc1b0c773 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,7 +3,6 @@ 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 e8f6cb51f0ad..e97dcc568a98 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8cf05ff1b671..e7b618599f61 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4a0620729d17..91cb88124f95 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,7 +3,6 @@ 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; @@ -40,16 +39,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 33e1b724576b..a07b574e2795 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,7 +3,6 @@ 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,24 +35,18 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b9e911f48fa7..7a7df0d04f85 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 233176c25d53..599e1966eecd 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,7 +3,6 @@ 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,10 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b247fe7b63c8..5ae73148544e 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 60a7996ef1f9..c3b8c576c36c 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,7 +3,6 @@ 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 24c5f71d93d9..84b890415735 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5e900406aeb6..b6bfb901b432 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,7 +3,6 @@ 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,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1da7a3e2ef19..94a2eb13e8af 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3a20e98baf7e..b6545d95e7bf 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cfa10e5cb5dd..6e71d9693004 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,7 +2,6 @@ import java.net.URI; 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 acaa8e50aa91..ab29c2cfc009 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,7 +3,6 @@ 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,13 +30,10 @@ 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 7ffab64ee1eb..646cc44b909f 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,7 +3,6 @@ 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,13 +30,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1e15e29798a3..a2551c1fa7b2 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,7 +3,6 @@ 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 c0c83681e122..4d5f5eb27b51 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,7 +3,6 @@ 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 a91f338c5a09..060789d0a512 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cdf15b9fbcfe..88a6685f4da8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3614b2ed6844..73b966943a14 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,7 +3,6 @@ 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; @@ -40,16 +39,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 28083ecc80a2..4baa34e74522 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,7 +3,6 @@ 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,24 +35,18 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1ea149bee2a5..9cf01b0cefb9 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 01f6d106b03d..b881a89e5d44 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,7 +3,6 @@ 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,10 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 64a005b67d82..9791b57e02c9 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9d9fa8b05fa6..13282587b94b 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,7 +3,6 @@ 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 c15d8b461eca..c199776fd118 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ec431100495f..f7bd44198867 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,7 +3,6 @@ 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,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 aff82cd909d6..d8a7642b507b 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 763ff76887c5..338b861acb7c 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +30,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 911ca84e0fc9..52205a82e314 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +32,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b85b8124de6c..2d647af3e340 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -35,16 +34,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -85,10 +80,8 @@ 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 34fefa217937..5b70efa954c3 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -38,17 +37,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -88,7 +84,6 @@ 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 004732b1789b..7e344ee33b83 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +30,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5760b8504888..1a7f9d53a1de 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +30,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 763ff76887c5..338b861acb7c 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +30,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 911ca84e0fc9..52205a82e314 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +32,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0ac7b477d0db..9e9765017ab7 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +33,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -84,10 +79,8 @@ 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 76e94c5b80a7..e7a4c5f76ddc 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +36,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -87,7 +83,6 @@ 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 004732b1789b..7e344ee33b83 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,7 +2,6 @@ import java.net.URI; import java.util.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,10 +30,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5760b8504888..1a7f9d53a1de 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +30,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 38e257be4546..d07f15297568 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -37,23 +34,18 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -97,7 +89,6 @@ public Foo dt(OffsetDateTime dt) { return dt; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dt") @JacksonXmlProperty(localName = "dt") public void setDt(@Nullable OffsetDateTime dt) { @@ -122,7 +113,6 @@ 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) { @@ -156,7 +146,6 @@ public List getListOfDt() { return listOfDt; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("listOfDt") @JacksonXmlProperty(localName = "listOfDt") @JacksonXmlElementWrapper(useWrapping = false) @@ -191,7 +180,6 @@ public List getListMinIntems() { return listMinIntems; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("listMinIntems") @JacksonXmlProperty(localName = "listMinIntems") @JacksonXmlElementWrapper(useWrapping = false) @@ -241,7 +229,6 @@ 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 ee0512f727d5..d38f527ddc1c 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -32,10 +29,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -68,7 +63,6 @@ public Category id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -93,7 +87,6 @@ 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 09bec0e60ea4..ed9435cd970f 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -34,13 +31,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -74,7 +68,6 @@ public ModelApiResponse code(@Nullable Integer code) { return code; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") @JacksonXmlProperty(localName = "code") public void setCode(@Nullable Integer code) { @@ -99,7 +92,6 @@ public ModelApiResponse type(@Nullable String type) { return type; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") @JacksonXmlProperty(localName = "type") public void setType(@Nullable String type) { @@ -124,7 +116,6 @@ 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 3a45cca8c07e..b6a9566eb959 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -36,16 +33,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -86,10 +79,8 @@ 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() { @@ -126,7 +117,6 @@ public Order id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -151,7 +141,6 @@ public Order petId(@Nullable Long petId) { return petId; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") @JacksonXmlProperty(localName = "petId") public void setPetId(@Nullable Long petId) { @@ -176,7 +165,6 @@ public Order quantity(@Nullable Integer quantity) { return quantity; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") @JacksonXmlProperty(localName = "quantity") public void setQuantity(@Nullable Integer quantity) { @@ -201,7 +189,6 @@ public Order shipDate(@Nullable OffsetDateTime shipDate) { return shipDate; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") @JacksonXmlProperty(localName = "shipDate") public void setShipDate(@Nullable OffsetDateTime shipDate) { @@ -226,7 +213,6 @@ public Order status(@Nullable StatusEnum status) { return status; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") @JacksonXmlProperty(localName = "status") public void setStatus(@Nullable StatusEnum status) { @@ -251,7 +237,6 @@ 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 ce7523e6fee7..8eaca2ce118c 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -39,17 +36,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -89,7 +83,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -135,7 +128,6 @@ public Pet id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -160,7 +152,6 @@ public Pet category(@Nullable Category category) { return category; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") @JacksonXmlProperty(localName = "Category") public void setCategory(@Nullable Category category) { @@ -254,7 +245,6 @@ public Pet addTagsItem(Tag tagsItem) { return tags; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") @JacksonXmlProperty(localName = "Tag") @JacksonXmlElementWrapper(localName = "tag", useWrapping = true) @@ -285,7 +275,6 @@ 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 8b0e49eb8941..ba92363341b5 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -32,10 +29,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -68,7 +63,6 @@ public Tag id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -93,7 +87,6 @@ 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 312a09e79028..ef7370bcb0c0 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -32,28 +29,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -92,7 +81,6 @@ public User id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") @JacksonXmlProperty(localName = "id") public void setId(@Nullable Long id) { @@ -117,7 +105,6 @@ public User username(@Nullable String username) { return username; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") @JacksonXmlProperty(localName = "username") public void setUsername(@Nullable String username) { @@ -142,7 +129,6 @@ public User firstName(@Nullable String firstName) { return firstName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") @JacksonXmlProperty(localName = "firstName") public void setFirstName(@Nullable String firstName) { @@ -167,7 +153,6 @@ public User lastName(@Nullable String lastName) { return lastName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") @JacksonXmlProperty(localName = "lastName") public void setLastName(@Nullable String lastName) { @@ -192,7 +177,6 @@ public User email(@Nullable String email) { return email; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") @JacksonXmlProperty(localName = "email") public void setEmail(@Nullable String email) { @@ -217,7 +201,6 @@ public User password(@Nullable String password) { return password; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") @JacksonXmlProperty(localName = "password") public void setPassword(@Nullable String password) { @@ -242,7 +225,6 @@ public User phone(@Nullable String phone) { return phone; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") @JacksonXmlProperty(localName = "phone") public void setPhone(@Nullable String phone) { @@ -267,7 +249,6 @@ 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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 285c75498b76..e91d631ed6ce 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 012830fb51ee..65256fec62d7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e99b12320ab2..8b2aae4f47c8 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -75,10 +70,8 @@ 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 aa7e8049ad41..8204ac088fd2 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -78,7 +74,6 @@ 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 238c2d398b64..752af7300bd6 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0f05a96beab1..90b75375b23f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e050e0c67b3e..cd4ca70bbd76 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,12 +2,9 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Bird import org.openapitools.model.Robobird import jakarta.validation.constraints.DecimalMax 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 4d7e7813783d..2c04b66ba59f 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,12 +2,9 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Bird import org.openapitools.model.Robobird import jakarta.validation.constraints.DecimalMax 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 c5611ef934c7..e3ca20f62dde 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,10 +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 import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo @@ -33,13 +30,9 @@ data class Bird( @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_BIRD", - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("propertyA") @get:JsonProperty("propertyA") val propertyA: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("sameNameProperty") @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 e11c5a0a1af1..fd68cebbbd66 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,10 +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 import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo @@ -33,13 +30,9 @@ data class Robobird( @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_ROBOBIRD", - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("propertyB") @get:JsonProperty("propertyB") val propertyB: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("sameNameProperty") @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 4012cb04f231..4712b79a3cac 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,7 +2,6 @@ import java.net.URI; 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 9ee0c1b2807d..bfdb5b06105f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 05024e14114d..f4c5514f4426 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,7 +2,6 @@ import java.net.URI; import java.util.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 30902a60c2df..36365c9a7a1b 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,7 +2,6 @@ import java.net.URI; import java.util.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 59823ce029a6..671b2504940e 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,7 +2,6 @@ import java.net.URI; 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 dde60f69542a..e6053f2676f6 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,7 +2,6 @@ import java.net.URI; 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 41a79066f461..d7af8ac2f376 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +19,10 @@ import javax.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 876981873b0e..17f359944597 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -23,18 +20,12 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c185ea107046..c5aeefef9cb9 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,33 +25,21 @@ import javax.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 978290446045..13230cd6a413 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -36,26 +33,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 cd1a35d618e7..d91b756eb790 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 12b33d8f20a6..2bd739c6dde1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,43 +25,27 @@ import javax.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 ec50829c0635..765c68c55802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3ebf5f5ea0cd..de13e1983566 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 76f4f093738b..e10ff9493c93 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 ebd784c67532..6be3f28f3fbb 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e833b8073c86..480c43759fe2 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 d1afe1c0927b..3dfd48b96c80 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 ec50829c0635..765c68c55802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3ebf5f5ea0cd..de13e1983566 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 76f4f093738b..e10ff9493c93 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 ebd784c67532..6be3f28f3fbb 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e833b8073c86..480c43759fe2 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 d1afe1c0927b..3dfd48b96c80 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 ec50829c0635..765c68c55802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3ebf5f5ea0cd..de13e1983566 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 76f4f093738b..e10ff9493c93 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 ebd784c67532..6be3f28f3fbb 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e833b8073c86..480c43759fe2 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 d1afe1c0927b..3dfd48b96c80 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 ec50829c0635..765c68c55802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3ebf5f5ea0cd..de13e1983566 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 76f4f093738b..e10ff9493c93 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 ebd784c67532..6be3f28f3fbb 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e833b8073c86..480c43759fe2 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 d1afe1c0927b..3dfd48b96c80 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 ec50829c0635..765c68c55802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3ebf5f5ea0cd..de13e1983566 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 76f4f093738b..e10ff9493c93 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 ebd784c67532..6be3f28f3fbb 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e833b8073c86..480c43759fe2 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 d1afe1c0927b..3dfd48b96c80 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 c4d95e75225c..92cbca7cbe70 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -23,8 +20,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class Annotation( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @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 b0c7a8a472e2..5ca548188de4 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag @@ -53,65 +50,45 @@ data class AnyOfUserOrPet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 245556f67207..50bf2ac745cd 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag @@ -53,65 +50,45 @@ data class AnyOfUserOrPetOrArrayString( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 70c208827031..78e69fe3206e 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 53ef9b788fdb..1a70cfc46c33 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 004b070872ad..67d32d113728 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 edcf36d7df67..9e4489fe6fcd 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 3e30bd07719f..7e598a009ae4 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 67857d6d788d..b31dd0ce4ea5 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,10 +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 import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue import javax.validation.constraints.DecimalMax @@ -36,44 +33,30 @@ data class User( @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 470958614b6f..c337b9d447ac 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag 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 ac6e66aebde0..e94b3aee8c38 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag 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 7aac833c5278..436cdb86a1b3 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +19,10 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2c5456d58b3f..2c15ecefe8c6 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,18 +20,12 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 79363b092edf..f1f63637f847 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.PlaceOrderResponse import org.openapitools.model.GetOrderByIdResponse import jakarta.validation.constraints.DecimalMax @@ -30,33 +27,21 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 0de23f8edb3c..a632610f7459 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import org.openapitools.model.UpdatePetResponse @@ -39,26 +36,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 87ccccbea017..ecbdc52c730d 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 94fd92baee7c..cd5bb62ec68c 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,10 +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 import org.openapitools.model.GetUserByNameResponse import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -29,43 +26,27 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 f44ed4c7ace6..84485a66eb96 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +19,10 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 8d84914db2ba..bc1eb76d4b71 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,18 +20,12 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 486848e14599..e865644bd4f8 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,33 +25,21 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 56c523367969..472eb39902dc 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -36,26 +33,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e3ec341838e6..f60b101132b0 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 93294737c422..3fcde2466802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,43 +25,27 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 f44ed4c7ace6..84485a66eb96 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +19,10 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 8d84914db2ba..bc1eb76d4b71 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,18 +20,12 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 486848e14599..e865644bd4f8 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,33 +25,21 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 56c523367969..472eb39902dc 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -36,26 +33,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e3ec341838e6..f60b101132b0 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 93294737c422..3fcde2466802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,43 +25,27 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 f44ed4c7ace6..84485a66eb96 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +19,10 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 8d84914db2ba..bc1eb76d4b71 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,18 +20,12 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 486848e14599..e865644bd4f8 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,33 +25,21 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 56c523367969..472eb39902dc 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -36,26 +33,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e3ec341838e6..f60b101132b0 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 93294737c422..3fcde2466802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,43 +25,27 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 f44ed4c7ace6..84485a66eb96 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +19,10 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 8d84914db2ba..bc1eb76d4b71 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,18 +20,12 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 486848e14599..e865644bd4f8 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,33 +25,21 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 c076750eb99a..6183fecadda2 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -36,26 +33,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 e3ec341838e6..f60b101132b0 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 93294737c422..3fcde2466802 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,43 +25,27 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 70d1f73e208f..b076f69d2cfa 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -36,14 +33,10 @@ data class Apa( @get:JsonProperty("cepa", required = true) val cepa: java.math.BigDecimal = java.math.BigDecimal("6.28318"), @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("depa") @get:JsonProperty("depa") val depa: java.math.BigDecimal? = java.math.BigDecimal("71"), @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("epa") @get:JsonProperty("epa") val epa: java.math.BigDecimal? = java.math.BigDecimal("-71"), 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 a79181c7ee83..c8f9e42d630f 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 621aaabbe505..62aa109e8227 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 7b43d5674865..030560495222 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 0aa99a764a76..463ea9d69c48 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 ba99d00fd09d..7233dac2641a 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 7fbfe9055862..ca75fe59632a 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 70c208827031..78e69fe3206e 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 53ef9b788fdb..1a70cfc46c33 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 004b070872ad..67d32d113728 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 45c87638f15f..094e09ad0a18 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 3e30bd07719f..7e598a009ae4 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 ec11f6cb5068..58c5d775bc53 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 4db812f3390c..4892c7ebd193 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -49,41 +46,29 @@ data class Cat( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("hunts") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("age") @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 af04a591d91a..41796c00cfe3 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 301b4c80b12f..320d49095c5d 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -62,29 +59,21 @@ data class Dog( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 1b1776c2ccfc..b41cd7d13e4b 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 0cb6324faa4b..c0592ae91b67 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 14b070fef3c8..3256dcc40cce 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,13 +3,10 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonValue -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Tag 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 5c9781bdd99d..e5da6730d6b9 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3e0e6531d605..1ec1bc9315f5 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 c7effc69943c..12c051928bf5 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.ReasonCode import org.openapitools.configuration.ValuedEnum import jakarta.validation.constraints.DecimalMax @@ -30,8 +27,6 @@ data class ApiError( @get:JsonProperty("errorCode", required = true) val errorCode: ApiError.ErrorCode, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("reasonCode") @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 6c4d3c5f36ee..c59ad252e2a2 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 9886cbcdc3ad..246eb740d4a9 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") var code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") var type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 7d68cd3f584e..199ac61b8616 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") var petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") var quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") var shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") var status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 3f3a4d005b5b..c95694c7697f 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,28 +37,20 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) var photoUrls: kotlin.collections.MutableList, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") var category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") var tags: kotlin.collections.MutableList? = null, @Schema(description = "pet status in the store") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 8dabb08a5f93..38f3ba26b235 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 86c750bac0c9..732aa16f274c 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") var username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") var firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") var lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") var email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") var password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") var phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 67a9e9aa4655..26e9cb7246ee 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -23,8 +20,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class MultipartMixedRequestMarker( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 8699b8c6b258..338cad3e82e1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 876981873b0e..17f359944597 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -23,18 +20,12 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c185ea107046..c5aeefef9cb9 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,33 +25,21 @@ import javax.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 d5959182a70f..1072289406f0 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -36,25 +33,17 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 cd1a35d618e7..d91b756eb790 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 12b33d8f20a6..2bd739c6dde1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,43 +25,27 @@ import javax.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 8699b8c6b258..338cad3e82e1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 876981873b0e..17f359944597 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -23,18 +20,12 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c185ea107046..c5aeefef9cb9 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,33 +25,21 @@ import javax.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 d5959182a70f..1072289406f0 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -36,25 +33,17 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 cd1a35d618e7..d91b756eb790 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 12b33d8f20a6..2bd739c6dde1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,43 +25,27 @@ import javax.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 466b9dbe86a3..00a0c004e41a 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("amount") @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 983d1f583f52..162d5f8926cd 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -26,13 +23,9 @@ data class Pet( @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 808117dbd28f..f8ded6dea368 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,10 +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 import org.openapitools.model.PageMeta import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -24,19 +21,13 @@ import jakarta.validation.Valid */ data class SearchResult( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("query") @get:JsonProperty("query") val query: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("totalHits") @get:JsonProperty("totalHits") val totalHits: kotlin.Int? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("page") @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 422da5e76453..1870d4ccb214 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 f65571c55f0f..173e389e2c47 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,10 +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 import org.openapitools.model.User import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -24,13 +21,9 @@ import jakarta.validation.Valid data class UserList( @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("content") @get:JsonProperty("content") val content: kotlin.collections.List? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("description") @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 70c208827031..78e69fe3206e 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 53ef9b788fdb..1a70cfc46c33 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 004b070872ad..67d32d113728 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 45c87638f15f..094e09ad0a18 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 3e30bd07719f..7e598a009ae4 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 ec11f6cb5068..58c5d775bc53 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 70c208827031..78e69fe3206e 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,15 +21,11 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 53ef9b788fdb..1a70cfc46c33 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 004b070872ad..67d32d113728 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 45c87638f15f..094e09ad0a18 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,29 +37,21 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 3e30bd07719f..7e598a009ae4 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 ec11f6cb5068..58c5d775bc53 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 49d3e8d0cdb9..a0cdb6a3e368 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,12 +2,9 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email 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 148d5e215f21..55210d36ff60 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,10 +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 import org.openapitools.model.Animal import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -30,14 +27,10 @@ data class Cat( @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("declawed") @get:JsonProperty("declawed") val declawed: kotlin.Boolean? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 0349895b01be..73ccf5dad3df 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,8 +25,6 @@ data class Category( @get:JsonProperty("name", required = true) val name: kotlin.String = "default-name", @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @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 5e178d382ad3..090f7b1617a3 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,8 +20,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class Client( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("client") @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 856de1f1a7b0..515b08c47709 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,10 +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 import org.openapitools.model.Animal import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -30,14 +27,10 @@ data class Dog( @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("breed") @get:JsonProperty("breed") val breed: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 b6003fa0b6ef..0ff3f3834455 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,8 +20,6 @@ import io.swagger.v3.oas.annotations.media.Schema data class Foo( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("bar") @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 1b9a66de986b..0dcf505c0339 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,10 +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 import org.openapitools.model.Foo import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -25,8 +22,6 @@ data class FooGetDefaultResponse( @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("string") @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 85191632cd69..d0443e18e453 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 2af160a5a2c6..bc597e1d9c17 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 3933754b80f8..ccfbbce25175 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -40,28 +37,20 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.Set, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 13b8277d89ed..cfb394d97826 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 28822e59853c..c870d154cca1 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 9ed84667a2bd..5a812b1b9303 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,10 +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 import org.openapitools.jackson.nullable.JsonNullable import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -31,12 +28,9 @@ data class NullableModel( @param:JsonProperty("requiredNullable") @get:JsonProperty("requiredNullable", required = true) val requiredNullable: kotlin.String?, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.FAIL) @param:JsonProperty("optionalNonNullable") @get:JsonProperty("optionalNonNullable") val optionalNonNullable: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_ABSENT) @param:JsonProperty("optionalNullable") @get:JsonProperty("optionalNullable") val optionalNullable: JsonNullable = JsonNullable.undefined() ) : java.io.Serializable { 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 11b4702d5b38..f249e7242f2b 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,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -26,13 +23,9 @@ data class Pet( @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.FAIL) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.FAIL) @param:JsonProperty("status") @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 2e4b3bc52c76..022cd5ef8d83 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 e14211ff5731..9c26231ac3a8 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 27dffa4141f6..5764d2f4bad5 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(value = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 3de771e29973..c22448547859 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,28 +37,20 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @ApiModelProperty(value = "pet status in the store") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 772d8a878a17..7bd373b57ac9 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3adc5fb6dc73..3547d749c89f 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(value = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 3a41378a588d..bbace9d4f62d 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 4b36930f1360..e49de97348c8 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 60cfdb5577f3..5a0f6ad69955 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 2f4708fe0104..d4f6dd39c641 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -40,28 +37,20 @@ data class Pet( @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 077505d41607..60fde5ce5caa 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 cb98bda412e2..56e78eddd54b 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 4db812f3390c..4892c7ebd193 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -49,41 +46,29 @@ data class Cat( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("hunts") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("age") @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 4935e94e1574..3e6f385de5e7 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2202f4aae40b..32e22c9d8201 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -62,29 +59,21 @@ data class Dog( @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 1b1776c2ccfc..b41cd7d13e4b 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,20 +22,14 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 0cb6324faa4b..c0592ae91b67 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,38 +27,26 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 21e90ed770f6..d75666491000 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,13 +3,10 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonValue -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Tag 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 5c9781bdd99d..e5da6730d6b9 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -24,14 +21,10 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3e0e6531d605..1ec1bc9315f5 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -30,50 +27,34 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(value = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 8699b8c6b258..338cad3e82e1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 876981873b0e..17f359944597 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -23,18 +20,12 @@ import javax.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 05b5fbbae3f3..79d96bb6cf5d 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.configuration.ValuedEnum import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin @@ -29,33 +26,21 @@ import javax.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 a94d6438c2b5..b5d91a727cea 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,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import org.openapitools.configuration.ValuedEnum @@ -37,25 +34,17 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 cd1a35d618e7..d91b756eb790 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,13 +19,9 @@ import javax.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 12b33d8f20a6..2bd739c6dde1 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,10 +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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -28,43 +25,27 @@ import javax.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 30bc93ff4da5..4dabb01f1e9c 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,7 +2,6 @@ import java.net.URI; import java.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; @@ -33,23 +32,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ObjectWithUniqueItems { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullSet = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private Set notNullSet = new LinkedHashSet<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 edd75902ba63..f72b2d941a04 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 090addbbd583..c733dd03d449 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e8a5db7c2cfe..53c42733dbd6 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesAnyType { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String name) { @@ -47,7 +43,6 @@ 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 3790bf7ab569..b30147f63b0c 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -29,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesArray { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 5785f0edaf45..dd3f7cab91d1 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesBoolean { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String name) { @@ -47,7 +43,6 @@ 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 dabffe7b93a1..59bdcc9cf957 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,36 +25,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -84,7 +71,6 @@ public Map getMapString() { return mapString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_string") public void setMapString(Map mapString) { this.mapString = mapString; @@ -114,7 +100,6 @@ public Map getMapNumber() { return mapNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_number") public void setMapNumber(Map mapNumber) { this.mapNumber = mapNumber; @@ -144,7 +129,6 @@ public Map getMapInteger() { return mapInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_integer") public void setMapInteger(Map mapInteger) { this.mapInteger = mapInteger; @@ -174,7 +158,6 @@ public Map getMapBoolean() { return mapBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_boolean") public void setMapBoolean(Map mapBoolean) { this.mapBoolean = mapBoolean; @@ -204,7 +187,6 @@ public Map> getMapArrayInteger() { return mapArrayInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_integer") public void setMapArrayInteger(Map> mapArrayInteger) { this.mapArrayInteger = mapArrayInteger; @@ -234,7 +216,6 @@ public Map> getMapArrayAnytype() { return mapArrayAnytype; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_array_anytype") public void setMapArrayAnytype(Map> mapArrayAnytype) { this.mapArrayAnytype = mapArrayAnytype; @@ -264,7 +245,6 @@ public Map> getMapMapString() { return mapMapString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_string") public void setMapMapString(Map> mapMapString) { this.mapMapString = mapMapString; @@ -294,7 +274,6 @@ public Map> getMapMapAnytype() { return mapMapAnytype; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_anytype") public void setMapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; @@ -316,7 +295,6 @@ public AdditionalPropertiesClass anytype1(@Nullable Object anytype1) { return anytype1; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("anytype_1") public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; @@ -359,7 +337,6 @@ 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 360609409551..0ade40300312 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesInteger { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String name) { @@ -47,7 +43,6 @@ 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 60915b85b8b7..ea78ecb1025f 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -29,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesNumber { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 680678b588e2..5822082c6eab 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -29,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesObject { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String name) { @@ -48,7 +44,6 @@ 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 0602a16979f5..baf6f8693ae9 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesString { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String name) { @@ -47,7 +43,6 @@ 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 0364cbeb451f..b05dd880f334 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,13 +3,10 @@ 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; @@ -40,7 +37,6 @@ public class Animal { private String className; - @JsonInclude(JsonInclude.Include.NON_NULL) private String color = "red"; public Animal() { @@ -91,7 +87,6 @@ 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 3580fffc402f..35284cc9339b 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { - @JsonInclude(JsonInclude.Include.NON_NULL) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { @@ -55,7 +51,6 @@ 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 424ea6ded9b5..62c8f63c5762 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly { - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @@ -55,7 +51,6 @@ 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 2a1da8ab2c7a..01afa4c76414 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -61,7 +55,6 @@ public List getArrayOfString() { return arrayOfString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_of_string") public void setArrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; @@ -91,7 +84,6 @@ public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("array_array_of_integer") public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { this.arrayArrayOfInteger = arrayArrayOfInteger; @@ -121,7 +113,6 @@ 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 a344aa882002..bb59b9b890e8 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,14 +3,11 @@ 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; @@ -69,7 +66,6 @@ public static KindEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable KindEnum kind; public BigCat() { @@ -99,7 +95,6 @@ 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 811258d49330..0cd596e70254 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,11 +2,8 @@ import java.net.URI; import java.util.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,22 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -58,7 +49,6 @@ public Capitalization smallCamel(@Nullable String smallCamel) { return smallCamel; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("smallCamel") public void setSmallCamel(@Nullable String smallCamel) { this.smallCamel = smallCamel; @@ -80,7 +70,6 @@ public Capitalization capitalCamel(@Nullable String capitalCamel) { return capitalCamel; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("CapitalCamel") public void setCapitalCamel(@Nullable String capitalCamel) { this.capitalCamel = capitalCamel; @@ -102,7 +91,6 @@ public Capitalization smallSnake(@Nullable String smallSnake) { return smallSnake; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("small_Snake") public void setSmallSnake(@Nullable String smallSnake) { this.smallSnake = smallSnake; @@ -124,7 +112,6 @@ public Capitalization capitalSnake(@Nullable String capitalSnake) { return capitalSnake; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("Capital_Snake") public void setCapitalSnake(@Nullable String capitalSnake) { this.capitalSnake = capitalSnake; @@ -146,7 +133,6 @@ 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; @@ -168,7 +154,6 @@ 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 e8666d33a3e2..435e51ac9bd4 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,13 +3,10 @@ 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; @@ -37,7 +34,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Cat extends Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Boolean declawed; public Cat() { @@ -67,7 +63,6 @@ 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 0920e9972f19..1488325f2367 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,11 +2,8 @@ import java.net.URI; import java.util.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; private String name = "default-name"; @@ -56,7 +52,6 @@ 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 ecf4dd98d0fc..82298f702715 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,14 +3,11 @@ 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; @@ -30,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String otherProperty) { @@ -49,7 +45,6 @@ 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 ae7726959eeb..95fb0bed41ea 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,11 +2,8 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ClassModel { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String propertyClass) { @@ -44,7 +40,6 @@ 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 68d1d67e9d69..45d37177d48c 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,11 +2,8 @@ import java.net.URI; import java.util.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,7 +21,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Client { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String client; public Client client(@Nullable String client) { @@ -43,7 +39,6 @@ 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 0f0727d69986..debbdab31a0f 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,13 +3,10 @@ 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; @@ -29,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Dog extends Animal { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String breed; public Dog() { @@ -59,7 +55,6 @@ 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 00a83253dffe..705927aff068 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -63,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -101,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { @@ -120,7 +115,6 @@ public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { return justSymbol; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("just_symbol") public void setJustSymbol(@Nullable JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; @@ -150,7 +144,6 @@ 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 c5b52e5f1168..6987686a8e4a 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,13 +2,10 @@ import java.net.URI; import java.util.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; @@ -65,7 +62,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -142,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -180,10 +175,8 @@ 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() { @@ -213,7 +206,6 @@ public EnumTest enumString(@Nullable EnumStringEnum enumString) { return enumString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_string") public void setEnumString(@Nullable EnumStringEnum enumString) { this.enumString = enumString; @@ -256,7 +248,6 @@ public EnumTest enumInteger(@Nullable EnumIntegerEnum enumInteger) { return enumInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_integer") public void setEnumInteger(@Nullable EnumIntegerEnum enumInteger) { this.enumInteger = enumInteger; @@ -278,7 +269,6 @@ public EnumTest enumNumber(@Nullable EnumNumberEnum enumNumber) { return enumNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("enum_number") public void setEnumNumber(@Nullable EnumNumberEnum enumNumber) { this.enumNumber = enumNumber; @@ -300,7 +290,6 @@ 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 a534baa11503..2b6314390901 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,11 +2,8 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class File { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String sourceURI; public File sourceURI(@Nullable String sourceURI) { @@ -44,7 +40,6 @@ 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 85da24365011..675978f8db79 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,10 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -50,7 +45,6 @@ public FileSchemaTestClass file(@Nullable File file) { return file; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("file") public void setFile(@Nullable File file) { this.file = file; @@ -80,7 +74,6 @@ 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 12be011e4b50..8219ed196fe3 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -32,44 +29,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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() { @@ -104,7 +91,6 @@ public FormatTest integer(@Nullable Integer integer) { return integer; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("integer") public void setInteger(@Nullable Integer integer) { this.integer = integer; @@ -128,7 +114,6 @@ public FormatTest int32(@Nullable Integer int32) { return int32; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int32") public void setInt32(@Nullable Integer int32) { this.int32 = int32; @@ -150,7 +135,6 @@ public FormatTest int64(@Nullable Long int64) { return int64; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("int64") public void setInt64(@Nullable Long int64) { this.int64 = int64; @@ -197,7 +181,6 @@ public FormatTest _float(@Nullable Float _float) { return _float; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("float") public void setFloat(@Nullable Float _float) { this._float = _float; @@ -221,7 +204,6 @@ public FormatTest _double(@Nullable Double _double) { return _double; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("double") public void setDouble(@Nullable Double _double) { this._double = _double; @@ -243,7 +225,6 @@ public FormatTest string(@Nullable String string) { return string; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("string") public void setString(@Nullable String string) { this.string = string; @@ -286,7 +267,6 @@ 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; @@ -329,7 +309,6 @@ public FormatTest dateTime(@Nullable OffsetDateTime dateTime) { return dateTime; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -351,7 +330,6 @@ public FormatTest uuid(@Nullable UUID uuid) { return uuid; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -394,7 +372,6 @@ 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 67d03b549c9b..ab739d233b7c 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,10 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -48,7 +43,6 @@ public HasOnlyReadOnly bar(@Nullable String bar) { return bar; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -70,7 +64,6 @@ 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 20a4b78b97f4..21ccac7b9606 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -27,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -65,13 +61,10 @@ 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) { @@ -98,7 +91,6 @@ public Map> getMapMapOfString() { return mapMapOfString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_map_of_string") public void setMapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; @@ -128,7 +120,6 @@ public Map getMapOfEnumString() { return mapOfEnumString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map_of_enum_string") public void setMapOfEnumString(Map mapOfEnumString) { this.mapOfEnumString = mapOfEnumString; @@ -158,7 +149,6 @@ public Map getDirectMap() { return directMap; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("direct_map") public void setDirectMap(Map directMap) { this.directMap = directMap; @@ -188,7 +178,6 @@ 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 4a1a2fafc376..6929f926ac91 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -30,14 +27,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -56,7 +50,6 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { return uuid; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("uuid") public void setUuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -78,7 +71,6 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(@Nullable OffsetDate return dateTime; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dateTime") public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; @@ -108,7 +100,6 @@ 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 c071004dcf37..4e1016868c4f 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,12 +2,9 @@ import java.net.URI; import java.util.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,10 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -49,7 +44,6 @@ public Model200Response name(@Nullable Integer name) { return name; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name") public void setName(@Nullable Integer name) { this.name = name; @@ -71,7 +65,6 @@ 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 2f93f69f9606..a57f1791a76b 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -51,7 +45,6 @@ public ModelApiResponse code(@Nullable Integer code) { return code; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("code") public void setCode(@Nullable Integer code) { this.code = code; @@ -73,7 +66,6 @@ public ModelApiResponse type(@Nullable String type) { return type; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("type") public void setType(@Nullable String type) { this.type = type; @@ -95,7 +87,6 @@ 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 12c0719d562d..21efc31dd24f 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelList { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String _123list; public ModelList _123list(@Nullable String _123list) { @@ -45,7 +41,6 @@ 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 7f3e8f170726..86af11448efe 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,12 +2,9 @@ import java.net.URI; import java.util.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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelReturn { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _return) { @@ -46,7 +42,6 @@ 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 e9a7f9cc9d8a..74e4ec24a902 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -27,13 +24,10 @@ 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() { @@ -84,7 +78,6 @@ public Name snakeCase(@Nullable Integer snakeCase) { return snakeCase; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("snake_case") public void setSnakeCase(@Nullable Integer snakeCase) { this.snakeCase = snakeCase; @@ -106,7 +99,6 @@ public Name property(@Nullable String property) { return property; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("property") public void setProperty(@Nullable String property) { this.property = property; @@ -128,7 +120,6 @@ 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 22cea2d2d766..ac1d89258230 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -25,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NumberOnly { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal justNumber) { @@ -44,7 +40,6 @@ 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 fdc614781b08..9fbb66cd1c2a 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -27,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +70,8 @@ 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) { @@ -99,7 +90,6 @@ public Order id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -121,7 +111,6 @@ public Order petId(@Nullable Long petId) { return petId; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("petId") public void setPetId(@Nullable Long petId) { this.petId = petId; @@ -143,7 +132,6 @@ public Order quantity(@Nullable Integer quantity) { return quantity; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("quantity") public void setQuantity(@Nullable Integer quantity) { this.quantity = quantity; @@ -165,7 +153,6 @@ public Order shipDate(@Nullable OffsetDateTime shipDate) { return shipDate; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("shipDate") public void setShipDate(@Nullable OffsetDateTime shipDate) { this.shipDate = shipDate; @@ -187,7 +174,6 @@ public Order status(@Nullable StatusEnum status) { return status; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("status") public void setStatus(@Nullable StatusEnum status) { this.status = status; @@ -209,7 +195,6 @@ 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 36b201b865cf..d56233734f36 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -25,13 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -50,7 +44,6 @@ public OuterComposite myNumber(@Nullable BigDecimal myNumber) { return myNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_number") public void setMyNumber(@Nullable BigDecimal myNumber) { this.myNumber = myNumber; @@ -72,7 +65,6 @@ public OuterComposite myString(@Nullable String myString) { return myString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("my_string") public void setMyString(@Nullable String myString) { this.myString = myString; @@ -94,7 +86,6 @@ 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 67fe6b9074de..94c9f23d249e 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,14 +3,11 @@ 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; @@ -70,7 +67,6 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; private @Nullable String nullableProperty = null; @@ -91,7 +87,6 @@ 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 6a20ec90e83f..e3e957e0effb 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -33,17 +30,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -83,7 +77,6 @@ public static StatusEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private @Nullable StatusEnum status; @@ -115,7 +108,6 @@ public Pet id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -137,7 +129,6 @@ public Pet category(@Nullable Category category) { return category; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("category") public void setCategory(@Nullable Category category) { this.category = category; @@ -218,7 +209,6 @@ public Pet addTagsItem(Tag tagsItem) { return tags; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("tags") public void setTags(List<@Valid Tag> tags) { this.tags = tags; @@ -245,7 +235,6 @@ 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 ffdb54f62711..d69a888693ac 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,11 +2,8 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -46,7 +41,6 @@ public ReadOnlyFirst bar(@Nullable String bar) { return bar; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("bar") public void setBar(@Nullable String bar) { this.bar = bar; @@ -68,7 +62,6 @@ 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 49e5a3dbd7b6..8922abd2aea9 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,11 +2,8 @@ import java.net.URI; import java.util.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,16 +21,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -52,7 +45,6 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String return normalPropertyName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("normalPropertyName") public void setNormalPropertyName(@Nullable String normalPropertyName) { this.normalPropertyName = normalPropertyName; @@ -74,7 +66,6 @@ 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; @@ -96,7 +87,6 @@ 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; @@ -118,7 +108,6 @@ 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 a037c51871ba..174c617927ec 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,12 +2,9 @@ import java.net.URI; import java.util.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; @@ -26,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class SpecialModelName { - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $specialPropertyName) { @@ -45,7 +41,6 @@ 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 54480713e85b..f27f68c69d32 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,11 +2,8 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -46,7 +41,6 @@ public Tag id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -68,7 +62,6 @@ 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 f7547a7e00c5..31908646688a 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,11 +2,8 @@ import java.net.URI; import java.util.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,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -64,7 +53,6 @@ public User id(@Nullable Long id) { return id; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("id") public void setId(@Nullable Long id) { this.id = id; @@ -86,7 +74,6 @@ public User username(@Nullable String username) { return username; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("username") public void setUsername(@Nullable String username) { this.username = username; @@ -108,7 +95,6 @@ public User firstName(@Nullable String firstName) { return firstName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("firstName") public void setFirstName(@Nullable String firstName) { this.firstName = firstName; @@ -130,7 +116,6 @@ public User lastName(@Nullable String lastName) { return lastName; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("lastName") public void setLastName(@Nullable String lastName) { this.lastName = lastName; @@ -152,7 +137,6 @@ public User email(@Nullable String email) { return email; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("email") public void setEmail(@Nullable String email) { this.email = email; @@ -174,7 +158,6 @@ public User password(@Nullable String password) { return password; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("password") public void setPassword(@Nullable String password) { this.password = password; @@ -196,7 +179,6 @@ public User phone(@Nullable String phone) { return phone; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("phone") public void setPhone(@Nullable String phone) { this.phone = phone; @@ -218,7 +200,6 @@ 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 fe3ac71771db..114c00720981 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,11 +2,8 @@ import java.net.URI; import java.util.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; @@ -28,91 +25,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { @@ -131,7 +99,6 @@ public XmlItem attributeString(@Nullable String attributeString) { return attributeString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_string") public void setAttributeString(@Nullable String attributeString) { this.attributeString = attributeString; @@ -153,7 +120,6 @@ public XmlItem attributeNumber(@Nullable BigDecimal attributeNumber) { return attributeNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_number") public void setAttributeNumber(@Nullable BigDecimal attributeNumber) { this.attributeNumber = attributeNumber; @@ -175,7 +141,6 @@ public XmlItem attributeInteger(@Nullable Integer attributeInteger) { return attributeInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_integer") public void setAttributeInteger(@Nullable Integer attributeInteger) { this.attributeInteger = attributeInteger; @@ -197,7 +162,6 @@ public XmlItem attributeBoolean(@Nullable Boolean attributeBoolean) { return attributeBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("attribute_boolean") public void setAttributeBoolean(@Nullable Boolean attributeBoolean) { this.attributeBoolean = attributeBoolean; @@ -227,7 +191,6 @@ public List getWrappedArray() { return wrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("wrapped_array") public void setWrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; @@ -249,7 +212,6 @@ public XmlItem nameString(@Nullable String nameString) { return nameString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_string") public void setNameString(@Nullable String nameString) { this.nameString = nameString; @@ -271,7 +233,6 @@ public XmlItem nameNumber(@Nullable BigDecimal nameNumber) { return nameNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_number") public void setNameNumber(@Nullable BigDecimal nameNumber) { this.nameNumber = nameNumber; @@ -293,7 +254,6 @@ public XmlItem nameInteger(@Nullable Integer nameInteger) { return nameInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_integer") public void setNameInteger(@Nullable Integer nameInteger) { this.nameInteger = nameInteger; @@ -315,7 +275,6 @@ public XmlItem nameBoolean(@Nullable Boolean nameBoolean) { return nameBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_boolean") public void setNameBoolean(@Nullable Boolean nameBoolean) { this.nameBoolean = nameBoolean; @@ -345,7 +304,6 @@ public List getNameArray() { return nameArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_array") public void setNameArray(List nameArray) { this.nameArray = nameArray; @@ -375,7 +333,6 @@ public List getNameWrappedArray() { return nameWrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("name_wrapped_array") public void setNameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; @@ -397,7 +354,6 @@ public XmlItem prefixString(@Nullable String prefixString) { return prefixString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_string") public void setPrefixString(@Nullable String prefixString) { this.prefixString = prefixString; @@ -419,7 +375,6 @@ public XmlItem prefixNumber(@Nullable BigDecimal prefixNumber) { return prefixNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_number") public void setPrefixNumber(@Nullable BigDecimal prefixNumber) { this.prefixNumber = prefixNumber; @@ -441,7 +396,6 @@ public XmlItem prefixInteger(@Nullable Integer prefixInteger) { return prefixInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_integer") public void setPrefixInteger(@Nullable Integer prefixInteger) { this.prefixInteger = prefixInteger; @@ -463,7 +417,6 @@ public XmlItem prefixBoolean(@Nullable Boolean prefixBoolean) { return prefixBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_boolean") public void setPrefixBoolean(@Nullable Boolean prefixBoolean) { this.prefixBoolean = prefixBoolean; @@ -493,7 +446,6 @@ public List getPrefixArray() { return prefixArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_array") public void setPrefixArray(List prefixArray) { this.prefixArray = prefixArray; @@ -523,7 +475,6 @@ public List getPrefixWrappedArray() { return prefixWrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_wrapped_array") public void setPrefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; @@ -545,7 +496,6 @@ public XmlItem namespaceString(@Nullable String namespaceString) { return namespaceString; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_string") public void setNamespaceString(@Nullable String namespaceString) { this.namespaceString = namespaceString; @@ -567,7 +517,6 @@ public XmlItem namespaceNumber(@Nullable BigDecimal namespaceNumber) { return namespaceNumber; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_number") public void setNamespaceNumber(@Nullable BigDecimal namespaceNumber) { this.namespaceNumber = namespaceNumber; @@ -589,7 +538,6 @@ public XmlItem namespaceInteger(@Nullable Integer namespaceInteger) { return namespaceInteger; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_integer") public void setNamespaceInteger(@Nullable Integer namespaceInteger) { this.namespaceInteger = namespaceInteger; @@ -611,7 +559,6 @@ public XmlItem namespaceBoolean(@Nullable Boolean namespaceBoolean) { return namespaceBoolean; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_boolean") public void setNamespaceBoolean(@Nullable Boolean namespaceBoolean) { this.namespaceBoolean = namespaceBoolean; @@ -641,7 +588,6 @@ public List getNamespaceArray() { return namespaceArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_array") public void setNamespaceArray(List namespaceArray) { this.namespaceArray = namespaceArray; @@ -671,7 +617,6 @@ public List getNamespaceWrappedArray() { return namespaceWrappedArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("namespace_wrapped_array") public void setNamespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; @@ -693,7 +638,6 @@ 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; @@ -715,7 +659,6 @@ 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; @@ -737,7 +680,6 @@ 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; @@ -759,7 +701,6 @@ 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; @@ -789,7 +730,6 @@ public List getPrefixNsArray() { return prefixNsArray; } - @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("prefix_ns_array") public void setPrefixNsArray(List prefixNsArray) { this.prefixNsArray = prefixNsArray; @@ -819,7 +759,6 @@ 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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f70cd7ba4544..e69cda4b505d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 68f1bee1399f..305e330826ea 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e8ace6a4ea5..0c998a8fe88d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 86be6e693c91..becdc509d0e2 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 0fc62e3905c4..2978ded66b53 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a3d50f5ea99d..3c636a9b5b24 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5372afa1d00f..1806e7e18411 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3235d3ca081e..c827f300da9e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f5dda830a79d..bdf22b885a7e 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,7 +3,6 @@ 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,7 +38,6 @@ 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 9a92cd526ace..76764757072b 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 baadabd27a2c..9ecd5b726492 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c86262a3c62d..be537f314137 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 44d4a8a4fa4f..2076c5089dd4 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,7 +3,6 @@ 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,7 +67,6 @@ 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 2049d25df082..e5e849af207f 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b74f7b14df59..dae0d9bff2d9 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 48bdaa9344f8..eacf21af2e6d 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 dfdd6ceef579..1ba638034de3 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 26961ecad89c..6e2bea391339 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fa81688184da..6629d2c2e7d1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 30539406b232..247e1d07b4e6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 10f181253377..eaa193e3efe4 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 53fcc7cf9a6c..58a35c55aeed 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 ef143d4788e3..4e93b751ebd5 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 3587f3d71e7d..fe07d9dbb166 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 12b3a130c8b3..ec7af4bfcf01 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c81f93c993ea..3aed66682b7c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5abbd8044e38..624b93da7528 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6434a14935bd..e9f2cbba5791 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 45cd6f3e51ed..fc399f544a4e 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6085143f72b3..f6f23a56bc4f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6eb0fbe0dc7..f97043d5bb61 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bf0855ee7cf5..b5f16d1ab7d6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e514481f175e..69da0d0ec785 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bd408cc22a7c..fef7f2e1161d 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 897b2fe03dd2..e2ceeea637fe 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty() { 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 7bee2fb216f4..f47532a34b25 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4bd1f09f3ab6..c9bb0315af3a 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 4360cb09bb06..a0eb32a2f862 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6f7cb3fcb82c..5c066166a7bf 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable() { 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 4a92bd5c7782..cac0e75f030e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 1c53b3f9b96d..3bdb1720e106 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bc0ae8290bf0..59a1cf9cd6ba 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e6d15f4a02e0..5cb71635aa7e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 680dacf1052d..6268f1153a2a 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c26d34985b3d..f0f90f941a28 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 12df74fa21fe..57ad8461f0b1 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5ca19685bbf4..d4d796a00710 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 af49f617a9a1..b2617aee8d53 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 29052f935f30..5988d5d726ed 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -75,10 +70,8 @@ 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 c4d654ac44a6..c515f6be0bfd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +27,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -78,7 +74,6 @@ 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 c8e8cebe1012..03f3c47200d6 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,7 +2,6 @@ import java.net.URI; import java.util.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 +21,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8ac4e02baa05..a6a2c5e9cd25 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +21,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9797eef1dc59..f19f4997dd03 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f3bfb780fefe..61be877a344b 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1df2ad972d5f..35b4c4432daa 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3a1809dfa191..836c04595185 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 1a3694366964..df00ee7de792 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bea92ee62da3..77f71d783370 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 af90c33109e5..0b2ac766798c 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d1b5173f07ad..3e7074afe6e4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 99e7a4cdca08..afb4c39df7d2 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,7 +3,6 @@ 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,7 +38,6 @@ 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 470b76a19ef8..98f9a7312d56 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 84a91551dcec..83b4b5a53030 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b6571aa9814f..fe517ac77848 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 82015028dc07..4b5df52572c4 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,7 +3,6 @@ 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,7 +67,6 @@ 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 a9906eb94fac..f0ca4951861e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9b23c6f442fe..983acc0affe8 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 75246c9ff8ce..ecb49fb56913 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 48f853d1aed5..657334adfdca 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a37e0bd1f899..646237355fbf 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bfde98877cce..729c3841a349 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 0e937a87f12b..92673cbc1dcd 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 67dc2cc354fc..be48b30c3af8 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 34e24214d1a3..b43f8ba34c73 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 c8c06116f9a1..f0692ccd8d88 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 d0d0714cd6bc..d1896abb8825 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ec05ace89cde..ab054e15dfa6 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e99a9a785740..2c0c89b27fcf 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7f1d0d04b32a..89035e734328 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f755e8a4354..756271ad591c 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 49c3684beb9e..d415ce24c88e 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2d3c7448725d..6bb791bbd3b0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fd4666eabb15..f99567868712 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c50eb6e43a2d..aee5e187fe1f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c1e2c3b4afa..353a8fd2b585 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3a21421bf13c..802116b61122 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 14cce68e1223..56d45c3ad292 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 a676f604dce1..3338eb6fc222 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 26e5407d048a..b18b1ac67105 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 6497f3716ea5..381de7e72949 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2b706856fd92..15183303f48a 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 cf4719096fb0..e29ec11ac445 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 8d6151ba031e..f40933c6379a 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ca39a83ad505..1288e7a312f8 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d89a1eece5ff..0e58199e5f58 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 64b558b48dae..2bce0cd548c9 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 482c18e703ff..8ca5ff87a882 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fe7cacc55db1..5e1af6bd1d24 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7233eb491283..b4fdd439ab82 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bcb196706fd1..0d6759f52c08 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3c11c181f683..df0d36296a3f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 37d3f00f767f..5250bfd61674 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,37 +31,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 9ae2e694aa73..ef62dfcc6047 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 eb389123f7a6..71009f22ac73 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 11db461d8dab..f32b44a5d4fd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0289d23ad8ac..a217467c9043 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 234aef7fb345..0e141172d442 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,7 +3,6 @@ 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; @@ -40,7 +39,6 @@ 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 208206c16add..e95bcfc0e3dd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 21a3327942b8..28d05932a5c4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3c2e76e5a48f..eee8b3069e75 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6ca9048f3a9d..c91039b41823 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 07ba266e9706..f55ab2684070 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,7 +3,6 @@ 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,7 +69,6 @@ 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 1fada1ad1cf8..e043a6dd43d3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b354cf260e1b..83a644719ecb 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,7 +3,6 @@ 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,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b54dbbd66b7f..73a4eeaa54be 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5e3b97d4ce21..e3dd2e8bf21b 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,7 +3,6 @@ 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,7 +32,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 903b9628b82f..f82c63511a80 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 aebd2c3534aa..b2872a88b9e4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValueDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index fe421ec5cd1d..1e4c9963dd3a 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,14 +29,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 daa288bc00a5..8b5866550d36 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,7 +3,6 @@ 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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 91c142030f49..a0d45bac55c1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -102,7 +100,6 @@ 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 7bd7ee977200..3c45014c6f1c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 635d2e3f04ed..bfdd0fe44938 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d9db95ad76ae..7be25fece7b0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,10 +28,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5894378400d2..c00fa9a20f4c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5d1d2fe1a4e5..b8fc28ea97b2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f0481922777e..833fcf244514 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f3124a4a864a..0fb6509f3399 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -66,13 +64,10 @@ 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 4c095937428f..6b93de9051e6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +30,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 51494cfbf2ac..094904e1690e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6561257a70c2..97cb1f51c0d3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +27,10 @@ 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/NullableMapPropertyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index e82c4b3a1679..98ba228cdc9b 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 34f45a303117..a5f228700675 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 12b2ceabc020..c26506b0f8df 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -78,10 +73,8 @@ 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 b80c315a4f26..5605ffe5e24d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4a5e5095239..9ca238397683 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,7 +3,6 @@ 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,10 +72,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 a760602c8d73..d79a35cecdc7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,17 +33,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -84,7 +80,6 @@ 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 671922834946..9176e04d2497 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 23b7b61efb3e..a5d4eb95316c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d7892e6f811b..e0a3e0ff49e6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9add6a684250..3006f2f6be4a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ba75f36ce267..af76e7513f2b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 26fb9afa0d0e..a5efe83e3002 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,28 +24,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a0a7047ef10..0426dca8bcf5 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,91 +28,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8bebe53b3407..12a27e31b013 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -32,14 +31,12 @@ 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 741915556d54..6d2cd66855f4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,21 +33,18 @@ 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 c3b14de3f295..15150db35258 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -35,28 +34,24 @@ 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; @@ -101,7 +96,6 @@ 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; @@ -109,7 +103,6 @@ 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 abb9aa57acef..6841397a4d46 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -38,14 +37,12 @@ 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 @@ -66,7 +63,6 @@ public class Pet { @JsonProperty("tags") @lombok.Builder.Default - @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -110,7 +106,6 @@ 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 0a70bef0dd88..613d27ef51a6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -32,14 +31,12 @@ 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 df90dcfb454d..97ccbfb7f7d1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -32,56 +31,48 @@ 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 34d737caeb42..84f88c28c03d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -29,10 +28,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 aaee5308193e..bdecbad7137c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +30,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 42a4ef10967e..fae7a68a42dd 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,16 +31,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -82,10 +77,8 @@ 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 3819f2efd3fb..883bd0e3f587 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -35,17 +34,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -85,7 +81,6 @@ 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 424e058b1eaf..97f2d1e61dfe 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -29,10 +28,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 431c258e7ee4..d81fb473cd7e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -29,28 +28,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0ea5e2a44c42..04fa39b9598e 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,7 +2,6 @@ import java.net.URI; import java.util.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 +24,8 @@ 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 477568049136..f30b74756ec5 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,7 +2,6 @@ import java.net.URI; import java.util.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,12 +24,10 @@ 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 52e6b08b402b..72005f1a9c58 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,7 +2,6 @@ import java.net.URI; 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; @@ -26,13 +25,10 @@ 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 745b54b83599..3943915901fb 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,7 +2,6 @@ import java.net.URI; import java.util.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 +24,8 @@ 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 b8aa8b27af7c..79f582aa6ef4 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,7 +2,6 @@ import java.net.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; @@ -29,10 +28,8 @@ 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 68aca95b6987..b3d2b8e934ca 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f8e6a50f1cb5..ea0b507c324b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2e07158268fa..f45d4cfe2d8d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +26,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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,10 +72,8 @@ 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 37d29c32b8da..3c578280b0cd 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -80,7 +76,6 @@ 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 17d305647101..ec805dc81eee 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,7 +2,6 @@ import java.net.URI; import java.util.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 +23,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bac00b6cdd0b..5d8ac5c931ae 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +23,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4798bc0c028d..444810641c7a 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2f923496661e..2d570d118638 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,7 +3,6 @@ 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,7 +38,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 853db31b217e..c4ae473599a9 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,7 +3,6 @@ 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,7 +67,6 @@ 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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 14fe6a7c76b9..168e018cdd45 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7bcdb4d68032..0d0d61ec2f17 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a0936f8a784..fe9ab6c64302 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4d90992ea4c..b729e52bbe02 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index 7330185d2021..31127013b739 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d095e6659db9..64c2548edd1e 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 673bb2e90254..39e68716e21e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fb78d1130272..550c2ba9458e 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6454c4e43354..d55ae048db8d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cad9a99b10f5..bca6f41ef594 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,7 +2,6 @@ import java.net.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; @@ -32,10 +31,8 @@ public class NullableModel implements Serializable { private JsonNullable requiredNullable = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String optionalNonNullable; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable optionalNullable = JsonNullable.undefined(); public NullableModel() { 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 81f0dd9c6551..5b090d83cb2c 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,7 +2,6 @@ import java.net.URI; import java.util.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,12 +24,10 @@ 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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 be90a2e1cd14..47b8e42b677f 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,7 +2,6 @@ import java.net.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,37 +26,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4e0c294dd76c..999fe2e6ea13 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,7 +3,6 @@ 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,7 +37,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d0a39c8854b9..6a2a34ae3729 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cb174a615f9b..9ac86b8d9bdd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e58434a4f202..3c9235435a53 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -79,7 +75,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4746b2e0d1f2..c2b20369867b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 be90a2e1cd14..47b8e42b677f 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,7 +2,6 @@ import java.net.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,37 +26,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4e0c294dd76c..999fe2e6ea13 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,7 +3,6 @@ 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,7 +37,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d0a39c8854b9..6a2a34ae3729 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cb174a615f9b..9ac86b8d9bdd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e58434a4f202..3c9235435a53 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -79,7 +75,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4746b2e0d1f2..c2b20369867b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 be90a2e1cd14..47b8e42b677f 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,7 +2,6 @@ import java.net.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,37 +26,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4e0c294dd76c..999fe2e6ea13 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,7 +3,6 @@ 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,7 +37,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d0a39c8854b9..6a2a34ae3729 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cb174a615f9b..9ac86b8d9bdd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e58434a4f202..3c9235435a53 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -79,7 +75,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4746b2e0d1f2..c2b20369867b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40737de5941e..be3ddd23c4b7 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e775d2a731b2..fbb5dd431ec6 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1a5423b8d91a..d6dcd87bc84d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 be90a2e1cd14..47b8e42b677f 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,7 +2,6 @@ import java.net.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,37 +26,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 88de22a04357..cbcf0e8033ce 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 782fb4c48c92..59450117a05a 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2db67c604f26..3367e44d93cc 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f440d61a5a44..40e800f1a770 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4e0c294dd76c..999fe2e6ea13 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,7 +3,6 @@ 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,7 +37,6 @@ 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 d1a197de6068..45f084cd4b84 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 091813f62458..a9ef229e56e5 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 910f371a7f2b..572f5fe4d4a3 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e38835f08058..b09bb3225d1e 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d0a39c8854b9..6a2a34ae3729 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f6a38799c911..5c9c9197c423 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9e0ae5b85a20..209a99352bd8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e55956e95884..f4ef99fb2ee1 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c4f6623f0f04..1963601fb469 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a27e17824a8e..9732b190e976 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 cef26523d335..1442cd20f1ab 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 f724c26f0cd2..c076c823c404 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a4778403f518..c2bfa2a8f998 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cb174a615f9b..9ac86b8d9bdd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4c6ed03f348b..50621d43527b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 40f9ff9b39b0..866b9eb73ec8 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 fbe00f3600c5..31585883bdd9 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 96035ef3a8d2..40f321d71fdb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 661b329fe284..e874e2849251 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 72ad5ad7a6b4..0064473d6f0e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2fc98b6fb666..e4ce317e24aa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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 42d698c51a26..18afd36f6a8c 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e844de2ad303..5fff47ef73c4 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e9a00ffd01ae..8ba3abc42956 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e58434a4f202..3c9235435a53 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -79,7 +75,6 @@ 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 381f8e572739..9c78fa190e27 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4746b2e0d1f2..c2b20369867b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c6e52de883f9..612c1ec989b3 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 819125eeda40..e933b7a29e62 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2edba3121890..556e89e288c0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 675a6f152630..454dc2da7d4d 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 e58434a4f202..3c9235435a53 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,7 +2,6 @@ import java.net.URI; import java.util.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,17 +28,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -79,7 +75,6 @@ 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 1f1090ad4b2d..ff4bc84bdb4d 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee41f7d9fc73..a2805fb0727f 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 faba16f61598..9eb7b6bf2785 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 be7f41a81d7c..36a88bbb2956 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 dca579c9121f..c4498bf65e89 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1b93d77f015d..ff90492a66a6 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 936cfb48c631..415bf2591a2d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 442516f4a9f6..616821004f7b 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0b99a6f53374..bd246129276d 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee462f8abdb3..68fb798e5627 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1f7e2da6b646..92c2f02e29b5 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,7 +3,6 @@ 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,7 +38,6 @@ 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 eb02803d61a2..23c98d95ef77 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 908d304908fa..153b1c52d6f6 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c30acc0cc68d..24852a6a6e21 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 19008c1d5b60..02da5f361fe1 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,7 +3,6 @@ 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,7 +67,6 @@ 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 4fa1526c6c85..e4b310de3e7b 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 181ba8ace110..562d96eb3c27 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 76970a34483f..6616a9f99f31 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0d253af8ab1a..0735faccbf7d 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9ebf293ee1d6..a1592e06e787 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d2ff498d1869..d7e6442815fe 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index ac5c31975e54..b5f4bc541e39 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 2c11947f2a4a..ac65c730ec54 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 58a95aa7769e..b6dff549c74f 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private Optional justSymbol = Optional.empty(); /** @@ -100,7 +98,6 @@ 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 4d882356686c..88f9ff145618 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private Optional enumString = Optional.empty(); /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private Optional enumInteger = Optional.empty(); /** @@ -179,10 +176,8 @@ 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 c30f7a211b46..3320abd9e949 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 429e0226689b..14d0d7c96808 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0584bf0b3730..5233f017196e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 48e42ebdf2bd..ea33275e9797 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 76f8c3918acc..1cafe66b4207 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 80f964b29671..e0ac81e415d3 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e17ede77c408..aea844d2d147 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 043c8b622adf..cfcc660dd2f1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 16f8f84a53d3..66b9f2eb87dc 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3de6333fb668..ae28abd89d87 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 390ab0989b32..a2bf81ac85fa 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java index 9856b0d77cd6..ab4c11a99f4f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 e63a1408d3e5..7cbc6a153afb 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9bf54fd855e4..7dfa020c6526 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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(); @@ -76,10 +71,8 @@ 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 a2055ef94fc1..a5ce3f7d738a 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 22db1d786cd5..90f2b9b9c7fc 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private Optional type = Optional.empty(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(TypeEnum type) { 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 8d3f1d0cf422..ea22df7284e7 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 1443c07c9e28..c59872e8a2e6 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ec09530ef0a1..db6b72a4a9f1 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6ed2b125a106..966b59c0cfd3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bf869af6a963..932840497bb6 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0214c2053d51..8918842cb810 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 253bd465588f..6ca1a0f20ed2 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d801742ef4a6..4bf9e18b202e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 12bce53502bc..0f08fd6d73c4 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4b951e1d740e..0c3439565fbc 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a38602c22da4..7a51e0f985b2 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,7 +2,6 @@ import java.net.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,37 +29,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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_ABSENT) 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 84149d7bd75e..aabbdad76b4d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7d0cf02fc1a0..af9e18f88627 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,7 +2,6 @@ import java.net.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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 420d47cbb299..3cb32be3b82f 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,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 58569a29f57d..ccfbdcca6d5c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import org.springframework.lang.Nullable; @@ -27,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b200b3f62188..76149ec0a8ab 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,7 +3,6 @@ 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,7 +38,6 @@ 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 f63d20f820cf..c2f5f5484751 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 10c7cf0aeaa7..c1aed68eaab6 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,7 +2,6 @@ import java.net.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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 41557fa75eb2..7b24a18f7f1b 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,7 +2,6 @@ import java.net.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; @@ -27,13 +26,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b34f4eddf43d..4e1aac42101c 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,7 +3,6 @@ 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,7 +67,6 @@ 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 f855f73444f8..d7a0e6e55530 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,7 +2,6 @@ import java.net.URI; import java.util.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,22 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 21cfe41ddec2..0c90b21f9811 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,7 +3,6 @@ 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,7 +35,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1114456a68a1..f39c218d9f6b 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a0f612496cf4..74069c6e8c9c 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,7 +3,6 @@ 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,7 +30,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 71b09eb7e58a..d87332b7d45d 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6159e67e4a52..5605d2466500 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +22,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index e969b98a302b..223beb5ce1d9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -2,7 +2,6 @@ import java.net.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,14 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValue { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValue() { 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 3fc05d2b0bef..09e3123bbf5c 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,7 +3,6 @@ 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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7e4aaa5e1281..a1dddb498f4e 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -62,7 +61,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -100,7 +98,6 @@ 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 7b02c6226925..68c999e43cec 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -179,10 +176,8 @@ 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 d797613a3327..7c6a9f980d0d 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 87e387835e05..88fee05bfb45 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,7 +2,6 @@ import java.net.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; @@ -27,10 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d1274d6cf08f..ac3834417a8f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e7388bc45390..ee8df830e2a6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 31574261e044..d6db3a46d00b 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,7 +2,6 @@ import java.net.URI; import java.util.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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -64,13 +62,10 @@ 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 34650661543e..191216309ac7 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,7 +2,6 @@ import java.net.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; @@ -29,14 +28,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 fc4a463a37f9..d2ec93e76bf9 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a0ce745397b7..e5ce35e1e516 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 4f6d20ee15b5..1414c325bff8 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 418d998d7250..eb69a04b7803 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5e8a32edb738..77492b4bb9ea 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,7 +2,6 @@ import java.net.URI; import java.util.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,13 +25,10 @@ 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/NullableMapProperty.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java index 7db52928c1c6..fc013fe70f4c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java @@ -2,7 +2,6 @@ import java.net.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; @@ -28,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapProperty { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapProperty languageValues(Map languageValues) { 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 d5a3aecb4b23..b5076e4b8ffe 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,7 +2,6 @@ import java.net.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,7 +23,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 179156958d22..74ade765fd5b 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +25,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -76,10 +71,8 @@ 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 d6fa72f10fbb..4d6f0c723a42 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,7 +2,6 @@ import java.net.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,13 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d092b2fc47d5..00c66617713b 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,7 +3,6 @@ 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,10 +71,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullable type(@Nullable TypeEnum type) { 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 68c3ebd77107..2278502e2c75 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,7 +2,6 @@ import java.net.URI; import java.util.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; @@ -32,17 +31,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -82,7 +78,6 @@ 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 61ca8fd712fd..ff046e811b8f 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3e032a86b2bf..23cb4b9d9a67 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,7 +2,6 @@ import java.net.URI; import java.util.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,16 +22,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bf2bf7743d3a..20258da6a869 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 dc8d4a1403f1..eb664162077c 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,7 +2,6 @@ import java.net.URI; import java.util.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 +22,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ee186f9d2b32..8f4321a72475 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,7 +2,6 @@ import java.net.URI; import java.util.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,28 +22,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3088bb19b032..a93d5532c6c8 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,7 +2,6 @@ import java.net.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,91 +26,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8e3d16dcc8c3..160ad371da85 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 561cecd69ccf..bcd3636ad682 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +26,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 eacc2158fcdd..9926b903ab12 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,7 +3,6 @@ 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,7 +38,6 @@ 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 208206c16add..e95bcfc0e3dd 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 21a3327942b8..28d05932a5c4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3c2e76e5a48f..eee8b3069e75 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e38f789a0f6f..f51e70b77971 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1fada1ad1cf8..e043a6dd43d3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ce9c5939132b..8e98846895a3 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b54dbbd66b7f..73a4eeaa54be 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5e3b97d4ce21..e3dd2e8bf21b 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,7 +3,6 @@ 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,7 +32,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 903b9628b82f..f82c63511a80 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 aebd2c3534aa..b2872a88b9e4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d56cfed97fb6..82526a7f8aba 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +26,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 67726db20b99..9c2b6138bca9 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,7 +3,6 @@ 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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 91c142030f49..a0d45bac55c1 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +63,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -102,7 +100,6 @@ 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 e64c0995389d..dbe4f3461f3c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -70,7 +69,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -147,7 +145,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -185,19 +182,14 @@ public static EnumNumberEnum fromValue(Double value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumNumberEnum enumNumber; - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 51c97df4966d..64cb9fd7c21e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +27,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 635d2e3f04ed..bfdd0fe44938 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d9db95ad76ae..7be25fece7b0 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,10 +28,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 0909f62113bd..b0e91ec947f4 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9280b90d46fd..2c0b9f25fb1e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9baeea9cc239..b7c5b5f4d9e8 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,50 +30,38 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5d1d2fe1a4e5..b8fc28ea97b2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/HealthCheckResultDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java index 2b3de797a45a..ac09a0a9834b 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class HealthCheckResultDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableMessage = JsonNullable.undefined(); public HealthCheckResultDto nullableMessage(String nullableMessage) { 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 f0481922777e..833fcf244514 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 f3124a4a864a..0fb6509f3399 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -66,13 +64,10 @@ 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 4c095937428f..6b93de9051e6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +30,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 51494cfbf2ac..094904e1690e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 6561257a70c2..97cb1f51c0d3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +27,10 @@ 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 99e4c9ecbf90..fffb8ab05d41 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -40,42 +39,30 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableClassDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable integerProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable numberProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable booleanProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable stringProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private JsonNullable dateProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private JsonNullable datetimeProp = JsonNullable.undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> arrayNullableProp = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItemsNullable = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> objectNullableProp = JsonNullable.>undefined(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 34f45a303117..a5f228700675 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 20fcb7e81930..cff7a8d070ea 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,18 +29,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 12b2ceabc020..c26506b0f8df 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +27,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -78,10 +73,8 @@ 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 b80c315a4f26..5605ffe5e24d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b4a5e5095239..9ca238397683 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,7 +3,6 @@ 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,10 +72,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 77a5d6571d54..d580c291b9fb 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,17 +33,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -84,7 +80,6 @@ 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 671922834946..9176e04d2497 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d7892e6f811b..e0a3e0ff49e6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9add6a684250..3006f2f6be4a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ba75f36ce267..af76e7513f2b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1d49001b23e6..26668f952b73 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 26fb9afa0d0e..a5efe83e3002 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,28 +24,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2da0ab2da0ba..941d81171fd3 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d085828a1a98..484b61d0172d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5626f5e509b5..064f04de7de9 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d04080bd138a..fdcae05b0129 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,37 +31,26 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; - @JsonInclude(JsonInclude.Include.NON_ABSENT) 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 6313ddf74bf4..ce6bca41aa2e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 d50ec95a91d1..ce38b72a2d66 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 bf3707a9e829..0d09c1a26855 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 60dfea1f6b82..9a523fc72b17 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 9954743744b8..92d5bb0a3978 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,7 +3,6 @@ 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; @@ -40,7 +39,6 @@ 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 f6f8bea0af90..ba9b6fad632b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 65c2c9b6a8f1..83a22ea05739 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 84c663d18a50..5a9ecdae4444 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +28,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b6187f29559e..4f3fd912fc43 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +28,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 3069dd95042a..45409ad5edde 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,7 +3,6 @@ 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,7 +70,6 @@ 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 9aca92a43ae7..f0b76760ae22 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,22 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 829a3912e622..e998c3402dd5 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,7 +3,6 @@ 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,7 +36,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 e9a8e17231e4..241e2ad4a11d 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1bbcbf6120cf..c72b49b8d0f0 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,7 +3,6 @@ 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,7 +32,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 a6981adc1f58..8958b3112b79 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7cd47ad86cc5..e963ad54ec92 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 935dbf3e6f4d..53ac711f261a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,14 +29,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ContainerDefaultValueDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArray = JsonNullable.>undefined(); private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); private List requiredArray = new ArrayList<>(); - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); public ContainerDefaultValueDto() { 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 4d8f537e4861..4554e660bec5 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,7 +3,6 @@ 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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 60ac280ce195..fd1a8e732041 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -65,7 +64,6 @@ public static JustSymbolEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable JustSymbolEnum justSymbol; /** @@ -103,7 +101,6 @@ 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 5ab270f93a2e..0ec2f2ef45c6 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -65,7 +64,6 @@ public static EnumStringEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumStringEnum enumString; /** @@ -142,7 +140,6 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -180,10 +177,8 @@ 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 b288d836c24d..dac997f9b4d2 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 c7ff6805ae2a..db7888f3eb11 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,10 +28,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 13b1eb4fcd2e..2c2065bec12a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,44 +30,34 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 7c801fb4a5f3..a9761ec2ba90 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5d892cbc2679..0cb63bba1953 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 85f1e6fe7dbe..6faa81b5457f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +27,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { - @JsonInclude(JsonInclude.Include.NON_NULL) private Map> mapMapOfString = new HashMap<>(); /** @@ -66,13 +64,10 @@ 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 ebd4a33b6a3f..5c29a37e0300 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +30,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 23d324fae4d9..abc198bac93e 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +25,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 585d573dfecf..12e83eee1d65 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +27,10 @@ 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/NullableMapPropertyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index e712397bff32..50958c247610 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -2,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +29,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NullableMapPropertyDto { - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable> languageValues = JsonNullable.>undefined(); public NullableMapPropertyDto languageValues(Map languageValues) { 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 8ca1f0ca792f..7aeda2a39e1c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 b98d7d3e3b7d..2b65285f2d0c 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +28,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; @@ -79,10 +74,8 @@ 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 5b1b21406275..481f8b7c1258 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,13 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 2162ebf85db4..9fc027c726a3 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,7 +3,6 @@ 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; @@ -74,10 +73,8 @@ public static TypeEnum fromValue(String value) { } } - @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable TypeEnum type; - @JsonInclude(JsonInclude.Include.NON_ABSENT) private JsonNullable nullableProperty = JsonNullable.undefined(); public ParentWithNullableDto type(@Nullable TypeEnum type) { 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 3953250b4693..45c5b2a8956b 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -35,17 +34,14 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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<>(); /** @@ -85,7 +81,6 @@ 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 6edfa379dfe9..98f3d28105a8 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 051039d81bb5..212e359b803f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,16 +24,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 5b018e45708b..7e25bf4e27ca 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +25,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 cf7af97ae837..0b8c1aa4019f 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,7 +24,6 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 8f3499f56a83..114b54b4bf15 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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 +24,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 ecc4e0fd74f4..fe29ed968848 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,28 +24,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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 1ed4b1154553..3e5f9452383a 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,7 +2,6 @@ import java.net.URI; import java.util.Objects; -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,91 +28,62 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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) { From 02cbbec93be11b7c6dda8580a610876920e8e745 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Wed, 29 Jul 2026 23:36:32 +0200 Subject: [PATCH 16/20] update samples --- ...tlin-spring-boot-3-no-response-entity.yaml | 2 + bin/configs/kotlin-spring-boot-3.yaml | 3 + bin/configs/kotlin-spring-boot-4.yaml | 2 + ...tlin-spring-boot-additionalproperties.yaml | 2 + ...kotlin-spring-boot-bigdecimal-default.yaml | 3 + ...otlin-spring-boot-delegate-nodefaults.yaml | 2 + bin/configs/kotlin-spring-boot-delegate.yaml | 2 + ...include-http-request-context-delegate.yaml | 2 + .../kotlin-spring-boot-integer-enum.yaml | 2 + .../kotlin-spring-boot-modelMutable.yaml | 3 + ...n-spring-boot-multipart-request-model.yaml | 3 + ...ring-boot-no-response-entity-delegate.yaml | 2 + ...kotlin-spring-boot-no-response-entity.yaml | 2 + ...spring-boot-oneof-discriminator-const.yaml | 2 + ...otlin-spring-boot-oneof-discriminator.yaml | 2 + ...-spring-boot-oneof-enum-discriminator.yaml | 2 + .../kotlin-spring-boot-paged-model.yaml | 2 + ...lin-spring-boot-reactive-without-flow.yaml | 2 + bin/configs/kotlin-spring-boot-reactive.yaml | 2 + .../kotlin-spring-boot-request-cookie.yaml | 2 + .../kotlin-spring-boot-sort-validation.yaml | 2 + .../kotlin-spring-boot-source-swagger1.yaml | 2 + .../kotlin-spring-boot-source-swagger2.yaml | 2 + ...otlin-spring-boot-x-kotlin-implements.yaml | 2 + bin/configs/kotlin-spring-boot.yaml | 3 + bin/configs/kotlin-spring-cloud.yaml | 2 + ...declarative-interface-bean-validation.yaml | 2 + ...arative-interface-reactive-coroutines.yaml | 2 + ...ve-interface-reactive-reactor-wrapped.yaml | 2 + ...-spring-declarative-interface-wrapped.yaml | 2 + .../kotlin-spring-declarative-interface.yaml | 2 + bin/configs/kotlin-spring-default.yaml | 4 ++ .../kotlin-spring-sealed-interfaces.yaml | 2 + ...g-boot-3-include-http-request-context.yaml | 2 + bin/configs/spring-boot-3.yaml | 3 + bin/configs/spring-boot-4-jspecify.yaml | 2 + bin/configs/spring-boot-4.yaml | 2 + .../spring-boot-api-response-examples.yaml | 2 + ...pring-boot-beanvalidation-no-nullable.yaml | 2 + bin/configs/spring-boot-beanvalidation.yaml | 2 + .../spring-boot-builtin-validation.yaml | 2 + ...g-boot-defaultInterface-unhandledExcp.yaml | 2 + bin/configs/spring-boot-delegate-j8.yaml | 2 + ...ring-boot-delegate-no-response-entity.yaml | 2 + bin/configs/spring-boot-delegate-oas3.yaml | 2 + bin/configs/spring-boot-delegate.yaml | 2 + .../spring-boot-file-delegate-optional.yaml | 2 + ...oot-implicitHeaders-annotationLibrary.yaml | 2 + .../spring-boot-implicitHeaders-oas3.yaml | 2 + bin/configs/spring-boot-implicitHeaders.yaml | 2 + ...ing-boot-include-http-request-context.yaml | 2 + bin/configs/spring-boot-lombok-data.yaml | 3 + bin/configs/spring-boot-lombok-tostring.yaml | 2 + bin/configs/spring-boot-oas3.yaml | 3 + bin/configs/spring-boot-oneof-interface.yaml | 2 + bin/configs/spring-boot-oneof-sealed.yaml | 2 + bin/configs/spring-boot-oneof.yaml | 2 + bin/configs/spring-boot-paged-model.yaml | 2 + ...t-petstore-with-api-response-examples.yaml | 2 + ...spring-boot-reactive-noResponseEntity.yaml | 2 + bin/configs/spring-boot-reactive.yaml | 2 + bin/configs/spring-boot-sort-validation.yaml | 2 + bin/configs/spring-boot-source.yaml | 2 + bin/configs/spring-boot-springdoc.yaml | 2 + bin/configs/spring-boot-useoptional.yaml | 3 + bin/configs/spring-boot-virtualan.yaml | 2 + .../spring-boot-x-implements-skip.yaml | 2 + bin/configs/spring-boot.yaml | 2 + bin/configs/spring-cloud-3-with-optional.yaml | 2 + bin/configs/spring-cloud-3.yaml | 2 + bin/configs/spring-cloud-4-with-optional.yaml | 2 + bin/configs/spring-cloud-async-oas3.yaml | 2 + bin/configs/spring-cloud-auth.yaml | 2 + bin/configs/spring-cloud-date-time-oas3.yaml | 2 + bin/configs/spring-cloud-date-time.yaml | 2 + bin/configs/spring-cloud-deprecated-oas3.yaml | 2 + bin/configs/spring-cloud-http-basic-only.yaml | 2 + bin/configs/spring-cloud-oas3-fakeapi.yaml | 2 + bin/configs/spring-cloud-oas3.yaml | 2 + ...d-petstore-feign-spring-pageable-oas3.yaml | 2 + ...loud-petstore-feign-without-url-param.yaml | 2 + bin/configs/spring-cloud-tags.yaml | 2 + bin/configs/spring-cloud.yaml | 2 + ...spring-http-interface-bean-validation.yaml | 2 + ...pring-http-interface-noResponseEntity.yaml | 2 + bin/configs/spring-http-interface-oauth.yaml | 2 + ...tp-interface-reactive-bean-validation.yaml | 2 + ...p-interface-reactive-noResponseEntity.yaml | 2 + .../spring-http-interface-reactive.yaml | 2 + .../spring-http-interface-springboot-4.yaml | 2 + ...ceProxyFactoryInterfacesConfiguration.yaml | 2 + bin/configs/spring-http-interface.yaml | 2 + bin/configs/spring-nullable-set.yaml | 2 + bin/configs/spring-stubs-oas3.yaml | 2 + .../spring-stubs-skip-default-interface.yaml | 2 + ...g-pageable-delegatePattern-without-j8.yaml | 2 + ...erver-spring-pageable-delegatePattern.yaml | 2 + ...ore-server-spring-pageable-without-j8.yaml | 2 + ...gboot-petstore-server-spring-pageable.yaml | 2 + ...t-petstore-server-spring-provide-args.yaml | 2 + .../main/java/org/openapitools/model/Pet.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../model/AdditionalPropertiesAnyTypeDto.java | 2 + .../model/AdditionalPropertiesArrayDto.java | 2 + .../model/AdditionalPropertiesBooleanDto.java | 2 + .../model/AdditionalPropertiesClassDto.java | 11 ++++ .../model/AdditionalPropertiesIntegerDto.java | 2 + .../model/AdditionalPropertiesNumberDto.java | 2 + .../model/AdditionalPropertiesObjectDto.java | 2 + .../model/AdditionalPropertiesStringDto.java | 2 + .../org/openapitools/model/AnimalDto.java | 3 + .../openapitools/model/ApiResponseDto.java | 4 ++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 + .../model/ArrayOfNumberOnlyDto.java | 2 + .../org/openapitools/model/ArrayTestDto.java | 4 ++ .../org/openapitools/model/BigCatDto.java | 2 + .../openapitools/model/CapitalizationDto.java | 7 +++ .../java/org/openapitools/model/CatDto.java | 2 + .../org/openapitools/model/CategoryDto.java | 3 + .../model/ChildWithNullableDto.java | 2 + .../org/openapitools/model/ClassModelDto.java | 2 + .../org/openapitools/model/ClientDto.java | 2 + .../model/ContainerDefaultValueDto.java | 3 + .../java/org/openapitools/model/DogDto.java | 2 + .../org/openapitools/model/EnumArraysDto.java | 3 + .../org/openapitools/model/EnumTestDto.java | 6 ++ .../java/org/openapitools/model/FileDto.java | 2 + .../model/FileSchemaTestClassDto.java | 3 + .../org/openapitools/model/FormatTestDto.java | 15 +++++ .../model/HasOnlyReadOnlyDto.java | 3 + .../java/org/openapitools/model/ListDto.java | 2 + .../org/openapitools/model/MapTestDto.java | 5 ++ ...ertiesAndAdditionalPropertiesClassDto.java | 4 ++ .../model/Model200ResponseDto.java | 3 + .../java/org/openapitools/model/NameDto.java | 5 ++ .../org/openapitools/model/NumberOnlyDto.java | 2 + .../java/org/openapitools/model/OrderDto.java | 7 +++ .../openapitools/model/OuterCompositeDto.java | 4 ++ .../model/ParentWithNullableDto.java | 2 + .../java/org/openapitools/model/PetDto.java | 7 +++ .../openapitools/model/ReadOnlyFirstDto.java | 3 + ...ponseObjectWithDifferentFieldNamesDto.java | 5 ++ .../org/openapitools/model/ReturnDto.java | 2 + .../model/SpecialModelNameDto.java | 2 + .../java/org/openapitools/model/TagDto.java | 3 + .../model/TypeHolderDefaultDto.java | 6 ++ .../model/TypeHolderExampleDto.java | 7 +++ .../java/org/openapitools/model/UserDto.java | 9 +++ .../org/openapitools/model/XmlItemDto.java | 30 +++++++++ .../model/AdditionalPropertiesAnyTypeDto.java | 2 + .../model/AdditionalPropertiesArrayDto.java | 2 + .../model/AdditionalPropertiesBooleanDto.java | 2 + .../model/AdditionalPropertiesClassDto.java | 11 ++++ .../model/AdditionalPropertiesIntegerDto.java | 2 + .../model/AdditionalPropertiesNumberDto.java | 2 + .../model/AdditionalPropertiesObjectDto.java | 2 + .../model/AdditionalPropertiesStringDto.java | 2 + .../org/openapitools/model/AnimalDto.java | 3 + .../openapitools/model/ApiResponseDto.java | 4 ++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 + .../model/ArrayOfNumberOnlyDto.java | 2 + .../org/openapitools/model/ArrayTestDto.java | 4 ++ .../org/openapitools/model/BigCatDto.java | 2 + .../openapitools/model/CapitalizationDto.java | 7 +++ .../java/org/openapitools/model/CatDto.java | 2 + .../org/openapitools/model/CategoryDto.java | 3 + .../model/ChildWithNullableDto.java | 2 + .../org/openapitools/model/ClassModelDto.java | 2 + .../org/openapitools/model/ClientDto.java | 2 + .../model/ContainerDefaultValueDto.java | 3 + .../java/org/openapitools/model/DogDto.java | 2 + .../org/openapitools/model/EnumArraysDto.java | 3 + .../org/openapitools/model/EnumTestDto.java | 6 ++ .../java/org/openapitools/model/FileDto.java | 2 + .../model/FileSchemaTestClassDto.java | 3 + .../org/openapitools/model/FormatTestDto.java | 15 +++++ .../model/HasOnlyReadOnlyDto.java | 3 + .../java/org/openapitools/model/ListDto.java | 2 + .../org/openapitools/model/MapTestDto.java | 5 ++ ...ertiesAndAdditionalPropertiesClassDto.java | 4 ++ .../model/Model200ResponseDto.java | 3 + .../java/org/openapitools/model/NameDto.java | 5 ++ .../org/openapitools/model/NumberOnlyDto.java | 2 + .../java/org/openapitools/model/OrderDto.java | 7 +++ .../openapitools/model/OuterCompositeDto.java | 4 ++ .../model/ParentWithNullableDto.java | 2 + .../java/org/openapitools/model/PetDto.java | 7 +++ .../openapitools/model/ReadOnlyFirstDto.java | 3 + ...ponseObjectWithDifferentFieldNamesDto.java | 5 ++ .../org/openapitools/model/ReturnDto.java | 2 + .../model/SpecialModelNameDto.java | 2 + .../java/org/openapitools/model/TagDto.java | 3 + .../model/TypeHolderDefaultDto.java | 6 ++ .../model/TypeHolderExampleDto.java | 7 +++ .../java/org/openapitools/model/UserDto.java | 9 +++ .../org/openapitools/model/XmlItemDto.java | 30 +++++++++ .../org/openapitools/model/CategoryDto.java | 7 +++ .../java/org/openapitools/model/PetDto.java | 13 ++++ .../java/org/openapitools/model/TagDto.java | 7 +++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyTypeDto.java | 5 ++ .../model/AdditionalPropertiesArrayDto.java | 5 ++ .../model/AdditionalPropertiesBooleanDto.java | 5 ++ .../model/AdditionalPropertiesClassDto.java | 23 +++++++ .../model/AdditionalPropertiesIntegerDto.java | 5 ++ .../model/AdditionalPropertiesNumberDto.java | 5 ++ .../model/AdditionalPropertiesObjectDto.java | 5 ++ .../model/AdditionalPropertiesStringDto.java | 5 ++ .../org/openapitools/model/AnimalDto.java | 6 ++ .../openapitools/model/ApiResponseDto.java | 9 +++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 5 ++ .../model/ArrayOfNumberOnlyDto.java | 5 ++ .../org/openapitools/model/ArrayTestDto.java | 9 +++ .../org/openapitools/model/BigCatDto.java | 5 ++ .../openapitools/model/CapitalizationDto.java | 15 +++++ .../java/org/openapitools/model/CatDto.java | 5 ++ .../org/openapitools/model/CategoryDto.java | 6 ++ .../model/ChildWithNullableDto.java | 5 ++ .../org/openapitools/model/ClassModelDto.java | 5 ++ .../org/openapitools/model/ClientDto.java | 5 ++ .../model/ContainerDefaultValueDto.java | 3 + .../java/org/openapitools/model/DogDto.java | 5 ++ .../org/openapitools/model/EnumArraysDto.java | 7 +++ .../org/openapitools/model/EnumTestDto.java | 12 ++++ .../java/org/openapitools/model/FileDto.java | 5 ++ .../model/FileSchemaTestClassDto.java | 7 +++ .../org/openapitools/model/FormatTestDto.java | 27 ++++++++ .../model/HasOnlyReadOnlyDto.java | 7 +++ .../java/org/openapitools/model/ListDto.java | 5 ++ .../org/openapitools/model/MapTestDto.java | 11 ++++ ...ertiesAndAdditionalPropertiesClassDto.java | 9 +++ .../model/Model200ResponseDto.java | 7 +++ .../java/org/openapitools/model/NameDto.java | 10 +++ .../org/openapitools/model/NumberOnlyDto.java | 5 ++ .../java/org/openapitools/model/OrderDto.java | 15 +++++ .../openapitools/model/OuterCompositeDto.java | 9 +++ .../model/ParentWithNullableDto.java | 5 ++ .../java/org/openapitools/model/PetDto.java | 13 ++++ .../openapitools/model/ReadOnlyFirstDto.java | 7 +++ ...ponseObjectWithDifferentFieldNamesDto.java | 11 ++++ .../org/openapitools/model/ReturnDto.java | 5 ++ .../model/SpecialModelNameDto.java | 5 ++ .../java/org/openapitools/model/TagDto.java | 7 +++ .../model/TypeHolderDefaultDto.java | 6 ++ .../model/TypeHolderExampleDto.java | 7 +++ .../java/org/openapitools/model/UserDto.java | 19 ++++++ .../org/openapitools/model/XmlItemDto.java | 61 +++++++++++++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyTypeDto.java | 2 + .../model/AdditionalPropertiesArrayDto.java | 2 + .../model/AdditionalPropertiesBooleanDto.java | 2 + .../model/AdditionalPropertiesClassDto.java | 11 ++++ .../model/AdditionalPropertiesIntegerDto.java | 2 + .../model/AdditionalPropertiesNumberDto.java | 2 + .../model/AdditionalPropertiesObjectDto.java | 2 + .../model/AdditionalPropertiesStringDto.java | 2 + .../org/openapitools/model/AnimalDto.java | 3 + .../openapitools/model/ApiResponseDto.java | 4 ++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 + .../model/ArrayOfNumberOnlyDto.java | 2 + .../org/openapitools/model/ArrayTestDto.java | 4 ++ .../org/openapitools/model/BigCatDto.java | 2 + .../openapitools/model/CapitalizationDto.java | 7 +++ .../java/org/openapitools/model/CatDto.java | 2 + .../org/openapitools/model/CategoryDto.java | 3 + .../model/ChildWithNullableDto.java | 2 + .../org/openapitools/model/ClassModelDto.java | 2 + .../org/openapitools/model/ClientDto.java | 2 + .../model/ContainerDefaultValueDto.java | 3 + .../java/org/openapitools/model/DogDto.java | 2 + .../org/openapitools/model/EnumArraysDto.java | 3 + .../org/openapitools/model/EnumTestDto.java | 6 ++ .../java/org/openapitools/model/FileDto.java | 2 + .../model/FileSchemaTestClassDto.java | 3 + .../org/openapitools/model/FormatTestDto.java | 15 +++++ .../model/HasOnlyReadOnlyDto.java | 3 + .../java/org/openapitools/model/ListDto.java | 2 + .../org/openapitools/model/MapTestDto.java | 5 ++ ...ertiesAndAdditionalPropertiesClassDto.java | 4 ++ .../model/Model200ResponseDto.java | 3 + .../java/org/openapitools/model/NameDto.java | 5 ++ .../org/openapitools/model/NumberOnlyDto.java | 2 + .../java/org/openapitools/model/OrderDto.java | 7 +++ .../openapitools/model/OuterCompositeDto.java | 4 ++ .../model/ParentWithNullableDto.java | 2 + .../java/org/openapitools/model/PetDto.java | 7 +++ .../openapitools/model/ReadOnlyFirstDto.java | 3 + ...ponseObjectWithDifferentFieldNamesDto.java | 5 ++ .../org/openapitools/model/ReturnDto.java | 2 + .../model/SpecialModelNameDto.java | 2 + .../java/org/openapitools/model/TagDto.java | 3 + .../model/TypeHolderDefaultDto.java | 6 ++ .../model/TypeHolderExampleDto.java | 7 +++ .../java/org/openapitools/model/UserDto.java | 9 +++ .../org/openapitools/model/XmlItemDto.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 7 +++ .../openapitools/model/ModelApiResponse.java | 9 +++ .../java/org/openapitools/model/Order.java | 15 +++++ .../main/java/org/openapitools/model/Pet.java | 13 ++++ .../main/java/org/openapitools/model/Tag.java | 7 +++ .../java/org/openapitools/model/User.java | 19 ++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../main/java/org/openapitools/model/Pet.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../org/openapitools/model/Addressable.java | 3 + .../java/org/openapitools/model/Animal.java | 1 + .../java/org/openapitools/model/Apple.java | 3 + .../java/org/openapitools/model/Banana.java | 3 + .../main/java/org/openapitools/model/Bar.java | 5 ++ .../org/openapitools/model/BarCreate.java | 4 ++ .../java/org/openapitools/model/BarRef.java | 1 + .../org/openapitools/model/BarRefOrValue.java | 1 + .../main/java/org/openapitools/model/Cat.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../java/org/openapitools/model/Entity.java | 6 ++ .../org/openapitools/model/EntityRef.java | 8 +++ .../org/openapitools/model/Extensible.java | 4 ++ .../main/java/org/openapitools/model/Foo.java | 3 + .../java/org/openapitools/model/FooRef.java | 2 + .../org/openapitools/model/FooRefOrValue.java | 1 + .../java/org/openapitools/model/Fruit.java | 1 + .../java/org/openapitools/model/Pasta.java | 2 + .../java/org/openapitools/model/Pizza.java | 2 + .../org/openapitools/model/PizzaSpeziale.java | 2 + .../org/openapitools/model/Addressable.java | 3 + .../java/org/openapitools/model/Animal.java | 1 + .../java/org/openapitools/model/Apple.java | 3 + .../java/org/openapitools/model/Banana.java | 3 + .../main/java/org/openapitools/model/Bar.java | 5 ++ .../org/openapitools/model/BarCreate.java | 4 ++ .../java/org/openapitools/model/BarRef.java | 1 + .../org/openapitools/model/BarRefOrValue.java | 1 + .../main/java/org/openapitools/model/Cat.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../java/org/openapitools/model/Entity.java | 6 ++ .../org/openapitools/model/EntityRef.java | 8 +++ .../org/openapitools/model/Extensible.java | 4 ++ .../main/java/org/openapitools/model/Foo.java | 3 + .../java/org/openapitools/model/FooRef.java | 2 + .../org/openapitools/model/FooRefOrValue.java | 1 + .../java/org/openapitools/model/Fruit.java | 1 + .../java/org/openapitools/model/Pasta.java | 2 + .../java/org/openapitools/model/Pizza.java | 2 + .../org/openapitools/model/PizzaSpeziale.java | 2 + .../org/openapitools/model/Addressable.java | 3 + .../java/org/openapitools/model/Animal.java | 1 + .../java/org/openapitools/model/Apple.java | 3 + .../java/org/openapitools/model/Banana.java | 3 + .../main/java/org/openapitools/model/Bar.java | 5 ++ .../org/openapitools/model/BarCreate.java | 4 ++ .../java/org/openapitools/model/BarRef.java | 1 + .../org/openapitools/model/BarRefOrValue.java | 1 + .../main/java/org/openapitools/model/Cat.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../java/org/openapitools/model/Entity.java | 6 ++ .../org/openapitools/model/EntityRef.java | 8 +++ .../org/openapitools/model/Extensible.java | 4 ++ .../main/java/org/openapitools/model/Foo.java | 3 + .../java/org/openapitools/model/FooRef.java | 2 + .../org/openapitools/model/FooRefOrValue.java | 1 + .../java/org/openapitools/model/Fruit.java | 1 + .../java/org/openapitools/model/Pasta.java | 2 + .../java/org/openapitools/model/Pizza.java | 2 + .../org/openapitools/model/PizzaSpeziale.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../main/java/org/openapitools/model/Foo.java | 14 +++++ .../java/org/openapitools/model/Category.java | 7 +++ .../openapitools/model/ModelApiResponse.java | 9 +++ .../java/org/openapitools/model/Order.java | 15 +++++ .../main/java/org/openapitools/model/Pet.java | 13 ++++ .../main/java/org/openapitools/model/Tag.java | 7 +++ .../java/org/openapitools/model/User.java | 19 ++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../main/java/org/openapitools/model/Pet.java | 3 + .../main/kotlin/org/openapitools/model/Cat.kt | 2 + .../main/kotlin/org/openapitools/model/Dog.kt | 3 + .../main/kotlin/org/openapitools/model/Pet.kt | 1 + .../kotlin/org/openapitools/model/Animal.kt | 3 + .../org/openapitools/model/AnotherAnimal.kt | 3 + .../kotlin/org/openapitools/model/Bird.kt | 9 +++ .../kotlin/org/openapitools/model/Robobird.kt | 9 +++ .../main/kotlin/org/openapitools/model/Car.kt | 3 + .../kotlin/org/openapitools/model/Truck.kt | 3 + .../kotlin/org/openapitools/model/Vehicle.kt | 1 + .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../org/openapitools/model/Annotation.kt | 5 ++ .../org/openapitools/model/AnyOfUserOrPet.kt | 26 ++++++++ .../model/AnyOfUserOrPetOrArrayString.kt | 26 ++++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 18 ++++++ .../org/openapitools/model/UserOrPet.kt | 3 + .../model/UserOrPetOrArrayString.kt | 3 + .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 4 ++ .../openapitools/model/ModelApiResponse.kt | 5 ++ .../kotlin/org/openapitools/model/Order.kt | 8 +++ .../main/kotlin/org/openapitools/model/Pet.kt | 9 +++ .../main/kotlin/org/openapitools/model/Tag.kt | 4 ++ .../kotlin/org/openapitools/model/User.kt | 10 +++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../main/kotlin/org/openapitools/model/Apa.kt | 9 +++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../main/kotlin/org/openapitools/model/Cat.kt | 18 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../main/kotlin/org/openapitools/model/Dog.kt | 17 ++++++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 3 + .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/ApiError.kt | 6 ++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../model/MultipartMixedRequestMarker.kt | 5 ++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Order.kt | 7 +++ .../kotlin/org/openapitools/model/PageMeta.kt | 5 ++ .../main/kotlin/org/openapitools/model/Pet.kt | 8 +++ .../org/openapitools/model/SearchResult.kt | 9 +++ .../kotlin/org/openapitools/model/User.kt | 7 +++ .../kotlin/org/openapitools/model/UserList.kt | 7 +++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Animal.kt | 3 + .../main/kotlin/org/openapitools/model/Cat.kt | 8 +++ .../kotlin/org/openapitools/model/Category.kt | 6 ++ .../kotlin/org/openapitools/model/Client.kt | 5 ++ .../main/kotlin/org/openapitools/model/Dog.kt | 8 +++ .../main/kotlin/org/openapitools/model/Foo.kt | 5 ++ .../model/FooGetDefaultResponse.kt | 5 ++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../org/openapitools/model/NullableModel.kt | 7 +++ .../main/kotlin/org/openapitools/model/Pet.kt | 8 +++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../main/kotlin/org/openapitools/model/Cat.kt | 18 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../main/kotlin/org/openapitools/model/Dog.kt | 17 ++++++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 3 + .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../kotlin/org/openapitools/model/Category.kt | 7 +++ .../openapitools/model/ModelApiResponse.kt | 9 +++ .../kotlin/org/openapitools/model/Order.kt | 15 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 13 ++++ .../main/kotlin/org/openapitools/model/Tag.kt | 7 +++ .../kotlin/org/openapitools/model/User.kt | 19 ++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/ObjectWithUniqueItems.java | 5 ++ .../main/java/org/openapitools/model/Dog.java | 3 + .../java/org/openapitools/model/Error.java | 3 + .../model/AdditionalPropertiesAnyType.java | 5 ++ .../model/AdditionalPropertiesArray.java | 5 ++ .../model/AdditionalPropertiesBoolean.java | 5 ++ .../model/AdditionalPropertiesClass.java | 23 +++++++ .../model/AdditionalPropertiesInteger.java | 5 ++ .../model/AdditionalPropertiesNumber.java | 5 ++ .../model/AdditionalPropertiesObject.java | 5 ++ .../model/AdditionalPropertiesString.java | 5 ++ .../java/org/openapitools/model/Animal.java | 6 ++ .../model/ArrayOfArrayOfNumberOnly.java | 5 ++ .../openapitools/model/ArrayOfNumberOnly.java | 5 ++ .../org/openapitools/model/ArrayTest.java | 9 +++ .../java/org/openapitools/model/BigCat.java | 5 ++ .../openapitools/model/Capitalization.java | 15 +++++ .../main/java/org/openapitools/model/Cat.java | 5 ++ .../java/org/openapitools/model/Category.java | 6 ++ .../openapitools/model/ChildWithNullable.java | 5 ++ .../org/openapitools/model/ClassModel.java | 5 ++ .../java/org/openapitools/model/Client.java | 5 ++ .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 5 ++ .../org/openapitools/model/EnumArrays.java | 7 +++ .../java/org/openapitools/model/EnumTest.java | 12 ++++ .../java/org/openapitools/model/File.java | 5 ++ .../model/FileSchemaTestClass.java | 7 +++ .../org/openapitools/model/FormatTest.java | 27 ++++++++ .../openapitools/model/HasOnlyReadOnly.java | 7 +++ .../java/org/openapitools/model/MapTest.java | 11 ++++ ...ropertiesAndAdditionalPropertiesClass.java | 9 +++ .../openapitools/model/Model200Response.java | 7 +++ .../openapitools/model/ModelApiResponse.java | 9 +++ .../org/openapitools/model/ModelList.java | 5 ++ .../org/openapitools/model/ModelReturn.java | 5 ++ .../java/org/openapitools/model/Name.java | 10 +++ .../org/openapitools/model/NumberOnly.java | 5 ++ .../java/org/openapitools/model/Order.java | 15 +++++ .../openapitools/model/OuterComposite.java | 9 +++ .../model/ParentWithNullable.java | 5 ++ .../main/java/org/openapitools/model/Pet.java | 13 ++++ .../org/openapitools/model/ReadOnlyFirst.java | 7 +++ ...ResponseObjectWithDifferentFieldNames.java | 11 ++++ .../openapitools/model/SpecialModelName.java | 5 ++ .../main/java/org/openapitools/model/Tag.java | 7 +++ .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 19 ++++++ .../java/org/openapitools/model/XmlItem.java | 61 +++++++++++++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyTypeDto.java | 2 + .../model/AdditionalPropertiesArrayDto.java | 2 + .../model/AdditionalPropertiesBooleanDto.java | 2 + .../model/AdditionalPropertiesClassDto.java | 11 ++++ .../model/AdditionalPropertiesIntegerDto.java | 2 + .../model/AdditionalPropertiesNumberDto.java | 2 + .../model/AdditionalPropertiesObjectDto.java | 2 + .../model/AdditionalPropertiesStringDto.java | 2 + .../org/openapitools/model/AnimalDto.java | 3 + .../openapitools/model/ApiResponseDto.java | 4 ++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 + .../model/ArrayOfNumberOnlyDto.java | 2 + .../org/openapitools/model/ArrayTestDto.java | 4 ++ .../org/openapitools/model/BigCatDto.java | 2 + .../openapitools/model/CapitalizationDto.java | 7 +++ .../java/org/openapitools/model/CatDto.java | 2 + .../org/openapitools/model/CategoryDto.java | 3 + .../model/ChildWithNullableDto.java | 2 + .../org/openapitools/model/ClassModelDto.java | 2 + .../org/openapitools/model/ClientDto.java | 2 + .../model/ContainerDefaultValueDto.java | 3 + .../java/org/openapitools/model/DogDto.java | 2 + .../org/openapitools/model/EnumArraysDto.java | 3 + .../org/openapitools/model/EnumTestDto.java | 6 ++ .../java/org/openapitools/model/FileDto.java | 2 + .../model/FileSchemaTestClassDto.java | 3 + .../org/openapitools/model/FormatTestDto.java | 15 +++++ .../model/HasOnlyReadOnlyDto.java | 3 + .../java/org/openapitools/model/ListDto.java | 2 + .../org/openapitools/model/MapTestDto.java | 5 ++ ...ertiesAndAdditionalPropertiesClassDto.java | 4 ++ .../model/Model200ResponseDto.java | 3 + .../java/org/openapitools/model/NameDto.java | 5 ++ .../org/openapitools/model/NumberOnlyDto.java | 2 + .../java/org/openapitools/model/OrderDto.java | 7 +++ .../openapitools/model/OuterCompositeDto.java | 4 ++ .../model/ParentWithNullableDto.java | 2 + .../java/org/openapitools/model/PetDto.java | 7 +++ .../openapitools/model/ReadOnlyFirstDto.java | 3 + ...ponseObjectWithDifferentFieldNamesDto.java | 5 ++ .../org/openapitools/model/ReturnDto.java | 2 + .../model/SpecialModelNameDto.java | 2 + .../java/org/openapitools/model/TagDto.java | 3 + .../model/TypeHolderDefaultDto.java | 6 ++ .../model/TypeHolderExampleDto.java | 7 +++ .../java/org/openapitools/model/UserDto.java | 9 +++ .../org/openapitools/model/XmlItemDto.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/Order.java | 3 + .../java/org/openapitools/model/PageMeta.java | 5 ++ .../main/java/org/openapitools/model/Pet.java | 4 ++ .../org/openapitools/model/SearchResult.java | 4 ++ .../java/org/openapitools/model/User.java | 3 + .../java/org/openapitools/model/UserList.java | 3 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../org/openapitools/model/NullableModel.java | 4 ++ .../main/java/org/openapitools/model/Pet.java | 4 ++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 12 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 12 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 12 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 12 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../java/org/openapitools/model/Order.java | 7 +++ .../main/java/org/openapitools/model/Pet.java | 7 +++ .../main/java/org/openapitools/model/Tag.java | 3 + .../java/org/openapitools/model/User.java | 9 +++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../java/org/openapitools/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../openapitools/model/ArrayOfNumberOnly.java | 2 + .../org/openapitools/model/ArrayTest.java | 4 ++ .../java/org/openapitools/model/BigCat.java | 2 + .../openapitools/model/Capitalization.java | 7 +++ .../main/java/org/openapitools/model/Cat.java | 2 + .../java/org/openapitools/model/Category.java | 3 + .../openapitools/model/ChildWithNullable.java | 2 + .../org/openapitools/model/ClassModel.java | 2 + .../java/org/openapitools/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../main/java/org/openapitools/model/Dog.java | 2 + .../org/openapitools/model/EnumArrays.java | 3 + .../java/org/openapitools/model/EnumTest.java | 6 ++ .../java/org/openapitools/model/File.java | 2 + .../model/FileSchemaTestClass.java | 3 + .../org/openapitools/model/FormatTest.java | 15 +++++ .../openapitools/model/HasOnlyReadOnly.java | 3 + .../java/org/openapitools/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../openapitools/model/Model200Response.java | 3 + .../openapitools/model/ModelApiResponse.java | 4 ++ .../org/openapitools/model/ModelList.java | 2 + .../org/openapitools/model/ModelReturn.java | 2 + .../java/org/openapitools/model/Name.java | 5 ++ .../org/openapitools/model/NumberOnly.java | 2 + .../java/org/openapitools/model/Order.java | 7 +++ .../openapitools/model/OuterComposite.java | 4 ++ .../model/ParentWithNullable.java | 2 + .../main/java/org/openapitools/model/Pet.java | 7 +++ .../org/openapitools/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../openapitools/model/SpecialModelName.java | 2 + .../main/java/org/openapitools/model/Tag.java | 3 + .../openapitools/model/TypeHolderDefault.java | 6 ++ .../openapitools/model/TypeHolderExample.java | 7 +++ .../java/org/openapitools/model/User.java | 9 +++ .../java/org/openapitools/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesAnyType.java | 2 + .../model/AdditionalPropertiesArray.java | 2 + .../model/AdditionalPropertiesBoolean.java | 2 + .../model/AdditionalPropertiesClass.java | 11 ++++ .../model/AdditionalPropertiesInteger.java | 2 + .../model/AdditionalPropertiesNumber.java | 2 + .../model/AdditionalPropertiesObject.java | 2 + .../model/AdditionalPropertiesString.java | 2 + .../openapitools/virtualan/model/Animal.java | 3 + .../model/ArrayOfArrayOfNumberOnly.java | 2 + .../virtualan/model/ArrayOfNumberOnly.java | 2 + .../virtualan/model/ArrayTest.java | 4 ++ .../openapitools/virtualan/model/BigCat.java | 2 + .../virtualan/model/Capitalization.java | 7 +++ .../org/openapitools/virtualan/model/Cat.java | 2 + .../virtualan/model/Category.java | 3 + .../virtualan/model/ChildWithNullable.java | 2 + .../virtualan/model/ClassModel.java | 2 + .../openapitools/virtualan/model/Client.java | 2 + .../model/ContainerDefaultValue.java | 3 + .../org/openapitools/virtualan/model/Dog.java | 2 + .../virtualan/model/EnumArrays.java | 3 + .../virtualan/model/EnumTest.java | 6 ++ .../openapitools/virtualan/model/File.java | 2 + .../virtualan/model/FileSchemaTestClass.java | 3 + .../virtualan/model/FormatTest.java | 15 +++++ .../virtualan/model/HasOnlyReadOnly.java | 3 + .../openapitools/virtualan/model/MapTest.java | 5 ++ ...ropertiesAndAdditionalPropertiesClass.java | 4 ++ .../virtualan/model/Model200Response.java | 3 + .../virtualan/model/ModelApiResponse.java | 4 ++ .../virtualan/model/ModelList.java | 2 + .../virtualan/model/ModelReturn.java | 2 + .../openapitools/virtualan/model/Name.java | 5 ++ .../virtualan/model/NumberOnly.java | 2 + .../openapitools/virtualan/model/Order.java | 7 +++ .../virtualan/model/OuterComposite.java | 4 ++ .../virtualan/model/ParentWithNullable.java | 2 + .../org/openapitools/virtualan/model/Pet.java | 7 +++ .../virtualan/model/ReadOnlyFirst.java | 3 + ...ResponseObjectWithDifferentFieldNames.java | 5 ++ .../virtualan/model/SpecialModelName.java | 2 + .../org/openapitools/virtualan/model/Tag.java | 3 + .../virtualan/model/TypeHolderDefault.java | 6 ++ .../virtualan/model/TypeHolderExample.java | 7 +++ .../openapitools/virtualan/model/User.java | 9 +++ .../openapitools/virtualan/model/XmlItem.java | 30 +++++++++ .../model/AdditionalPropertiesClassDto.java | 3 + .../model/AllOfWithSingleRefDto.java | 3 + .../org/openapitools/model/AnimalDto.java | 3 + .../openapitools/model/ApiResponseDto.java | 4 ++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 + .../model/ArrayOfNumberOnlyDto.java | 2 + .../org/openapitools/model/ArrayTestDto.java | 4 ++ .../openapitools/model/CapitalizationDto.java | 7 +++ .../java/org/openapitools/model/CatDto.java | 2 + .../org/openapitools/model/CategoryDto.java | 3 + .../model/ChildWithNullableDto.java | 2 + .../org/openapitools/model/ClassModelDto.java | 2 + .../org/openapitools/model/ClientDto.java | 2 + .../model/DeprecatedObjectDto.java | 2 + .../java/org/openapitools/model/DogDto.java | 2 + .../org/openapitools/model/EnumArraysDto.java | 3 + .../org/openapitools/model/EnumTestDto.java | 8 +++ .../FakeBigDecimalMap200ResponseDto.java | 3 + .../java/org/openapitools/model/FileDto.java | 2 + .../model/FileSchemaTestClassDto.java | 3 + .../java/org/openapitools/model/FooDto.java | 2 + .../model/FooGetDefaultResponseDto.java | 2 + .../org/openapitools/model/FormatTestDto.java | 17 ++++++ .../model/HasOnlyReadOnlyDto.java | 3 + .../java/org/openapitools/model/ListDto.java | 2 + .../org/openapitools/model/MapTestDto.java | 5 ++ ...ertiesAndAdditionalPropertiesClassDto.java | 4 ++ .../model/Model200ResponseDto.java | 3 + .../java/org/openapitools/model/NameDto.java | 5 ++ .../openapitools/model/NullableClassDto.java | 3 + .../org/openapitools/model/NumberOnlyDto.java | 2 + .../model/ObjectWithDeprecatedFieldsDto.java | 5 ++ .../java/org/openapitools/model/OrderDto.java | 7 +++ .../openapitools/model/OuterCompositeDto.java | 4 ++ .../model/OuterObjectWithEnumPropertyDto.java | 2 + .../model/ParentWithNullableDto.java | 2 + .../java/org/openapitools/model/PetDto.java | 7 +++ .../openapitools/model/ReadOnlyFirstDto.java | 3 + .../org/openapitools/model/ReturnDto.java | 2 + .../model/SpecialModelNameDto.java | 2 + .../java/org/openapitools/model/TagDto.java | 3 + ...reeformAdditionalPropertiesRequestDto.java | 2 + .../java/org/openapitools/model/UserDto.java | 9 +++ .../model/AdditionalPropertiesAnyTypeDto.java | 2 + .../model/AdditionalPropertiesArrayDto.java | 2 + .../model/AdditionalPropertiesBooleanDto.java | 2 + .../model/AdditionalPropertiesClassDto.java | 11 ++++ .../model/AdditionalPropertiesIntegerDto.java | 2 + .../model/AdditionalPropertiesNumberDto.java | 2 + .../model/AdditionalPropertiesObjectDto.java | 2 + .../model/AdditionalPropertiesStringDto.java | 2 + .../org/openapitools/model/AnimalDto.java | 3 + .../openapitools/model/ApiResponseDto.java | 4 ++ .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 + .../model/ArrayOfNumberOnlyDto.java | 2 + .../org/openapitools/model/ArrayTestDto.java | 4 ++ .../org/openapitools/model/BigCatDto.java | 2 + .../openapitools/model/CapitalizationDto.java | 7 +++ .../java/org/openapitools/model/CatDto.java | 2 + .../org/openapitools/model/CategoryDto.java | 3 + .../model/ChildWithNullableDto.java | 2 + .../org/openapitools/model/ClassModelDto.java | 2 + .../org/openapitools/model/ClientDto.java | 2 + .../model/ContainerDefaultValueDto.java | 3 + .../java/org/openapitools/model/DogDto.java | 2 + .../org/openapitools/model/EnumArraysDto.java | 3 + .../org/openapitools/model/EnumTestDto.java | 6 ++ .../java/org/openapitools/model/FileDto.java | 2 + .../model/FileSchemaTestClassDto.java | 3 + .../org/openapitools/model/FormatTestDto.java | 15 +++++ .../model/HasOnlyReadOnlyDto.java | 3 + .../java/org/openapitools/model/ListDto.java | 2 + .../org/openapitools/model/MapTestDto.java | 5 ++ ...ertiesAndAdditionalPropertiesClassDto.java | 4 ++ .../model/Model200ResponseDto.java | 3 + .../java/org/openapitools/model/NameDto.java | 5 ++ .../org/openapitools/model/NumberOnlyDto.java | 2 + .../java/org/openapitools/model/OrderDto.java | 7 +++ .../openapitools/model/OuterCompositeDto.java | 4 ++ .../model/ParentWithNullableDto.java | 2 + .../java/org/openapitools/model/PetDto.java | 7 +++ .../openapitools/model/ReadOnlyFirstDto.java | 3 + ...ponseObjectWithDifferentFieldNamesDto.java | 5 ++ .../org/openapitools/model/ReturnDto.java | 2 + .../model/SpecialModelNameDto.java | 2 + .../java/org/openapitools/model/TagDto.java | 3 + .../model/TypeHolderDefaultDto.java | 6 ++ .../model/TypeHolderExampleDto.java | 7 +++ .../java/org/openapitools/model/UserDto.java | 9 +++ .../org/openapitools/model/XmlItemDto.java | 30 +++++++++ 1844 files changed, 9600 insertions(+) diff --git a/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml b/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml index b0b7c3fe3825..fb88b7e5c053 100644 --- a/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml +++ b/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-3.yaml b/bin/configs/kotlin-spring-boot-3.yaml index 5c0572cf1cb4..a102ecb2e695 100644 --- a/bin/configs/kotlin-spring-boot-3.yaml +++ b/bin/configs/kotlin-spring-boot-3.yaml @@ -4,6 +4,9 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NONE" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-4.yaml b/bin/configs/kotlin-spring-boot-4.yaml index 6779d1910974..c544279bd050 100644 --- a/bin/configs/kotlin-spring-boot-4.yaml +++ b/bin/configs/kotlin-spring-boot-4.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-additionalproperties.yaml b/bin/configs/kotlin-spring-boot-additionalproperties.yaml index e9c962afffd6..59588abd4d20 100644 --- a/bin/configs/kotlin-spring-boot-additionalproperties.yaml +++ b/bin/configs/kotlin-spring-boot-additionalproperties.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: samples/server/petstore/kotlin-springboot-additionalproperties/src/main/resources/openapi.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-bigdecimal-default.yaml b/bin/configs/kotlin-spring-boot-bigdecimal-default.yaml index 6fa5b9556499..67ad5f0518b3 100644 --- a/bin/configs/kotlin-spring-boot-bigdecimal-default.yaml +++ b/bin/configs/kotlin-spring-boot-bigdecimal-default.yaml @@ -3,3 +3,6 @@ outputDir: samples/server/petstore/kotlin-springboot-bigdecimal-default library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_14584_bigdecimal_default.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" diff --git a/bin/configs/kotlin-spring-boot-delegate-nodefaults.yaml b/bin/configs/kotlin-spring-boot-delegate-nodefaults.yaml index 3596dbcf6383..778495dcd07b 100644 --- a/bin/configs/kotlin-spring-boot-delegate-nodefaults.yaml +++ b/bin/configs/kotlin-spring-boot-delegate-nodefaults.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: swagger2 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-delegate.yaml b/bin/configs/kotlin-spring-boot-delegate.yaml index 2eb2f2e43e89..c09fcf345fdb 100644 --- a/bin/configs/kotlin-spring-boot-delegate.yaml +++ b/bin/configs/kotlin-spring-boot-delegate.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc annotationLibrary: swagger2 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml b/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml index 44b82e9702fc..51990ca79a95 100644 --- a/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml +++ b/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: swagger1 useSwaggerUI: false diff --git a/bin/configs/kotlin-spring-boot-integer-enum.yaml b/bin/configs/kotlin-spring-boot-integer-enum.yaml index 0b23e72b5bf6..3b470aed9488 100644 --- a/bin/configs/kotlin-spring-boot-integer-enum.yaml +++ b/bin/configs/kotlin-spring-boot-integer-enum.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/issue19244_integer_enum.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" interfaceOnly: "true" skipDefaultInterface: "true" useTags: "true" diff --git a/bin/configs/kotlin-spring-boot-modelMutable.yaml b/bin/configs/kotlin-spring-boot-modelMutable.yaml index ba49fcc91f90..2fb63e2cc4fc 100644 --- a/bin/configs/kotlin-spring-boot-modelMutable.yaml +++ b/bin/configs/kotlin-spring-boot-modelMutable.yaml @@ -4,6 +4,9 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NON_DEFAULT" documentationProvider: springdoc annotationLibrary: swagger2 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-multipart-request-model.yaml b/bin/configs/kotlin-spring-boot-multipart-request-model.yaml index 63d0b59fd5bb..184f3722f01f 100644 --- a/bin/configs/kotlin-spring-boot-multipart-request-model.yaml +++ b/bin/configs/kotlin-spring-boot-multipart-request-model.yaml @@ -3,3 +3,6 @@ outputDir: samples/server/petstore/kotlin-springboot-multipart-request-model library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_15251_multipart_request_model.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" diff --git a/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml b/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml index d5ad5a5a4b41..eb41fe7444b9 100644 --- a/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml +++ b/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-no-response-entity.yaml b/bin/configs/kotlin-spring-boot-no-response-entity.yaml index 007fadf41864..ad4bac02f91b 100644 --- a/bin/configs/kotlin-spring-boot-no-response-entity.yaml +++ b/bin/configs/kotlin-spring-boot-no-response-entity.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-oneof-discriminator-const.yaml b/bin/configs/kotlin-spring-boot-oneof-discriminator-const.yaml index 1ecd7a2b660e..7198eb9926af 100644 --- a/bin/configs/kotlin-spring-boot-oneof-discriminator-const.yaml +++ b/bin/configs/kotlin-spring-boot-oneof-discriminator-const.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_1/polymorphism-and-discriminator.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-oneof-discriminator.yaml b/bin/configs/kotlin-spring-boot-oneof-discriminator.yaml index 2d2edd95bfd1..228d0dcf5026 100644 --- a/bin/configs/kotlin-spring-boot-oneof-discriminator.yaml +++ b/bin/configs/kotlin-spring-boot-oneof-discriminator.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism-oneof-discriminator.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-oneof-enum-discriminator.yaml b/bin/configs/kotlin-spring-boot-oneof-enum-discriminator.yaml index 235978710b26..53b322f29f00 100644 --- a/bin/configs/kotlin-spring-boot-oneof-enum-discriminator.yaml +++ b/bin/configs/kotlin-spring-boot-oneof-enum-discriminator.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism-oneof-enum-discriminator.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-paged-model.yaml b/bin/configs/kotlin-spring-boot-paged-model.yaml index 02776a3a1c5b..079e3a49b83a 100644 --- a/bin/configs/kotlin-spring-boot-paged-model.yaml +++ b/bin/configs/kotlin-spring-boot-paged-model.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-paged-model.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-reactive-without-flow.yaml b/bin/configs/kotlin-spring-boot-reactive-without-flow.yaml index 8f29401890a4..8428cfbede8e 100644 --- a/bin/configs/kotlin-spring-boot-reactive-without-flow.yaml +++ b/bin/configs/kotlin-spring-boot-reactive-without-flow.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc annotationLibrary: swagger2 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-reactive.yaml b/bin/configs/kotlin-spring-boot-reactive.yaml index c05cc232fcf4..a8272859ce07 100644 --- a/bin/configs/kotlin-spring-boot-reactive.yaml +++ b/bin/configs/kotlin-spring-boot-reactive.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc annotationLibrary: swagger2 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-request-cookie.yaml b/bin/configs/kotlin-spring-boot-request-cookie.yaml index fdf613630ae9..7aeb82984780 100644 --- a/bin/configs/kotlin-spring-boot-request-cookie.yaml +++ b/bin/configs/kotlin-spring-boot-request-cookie.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-fake-endpoints-for-testing-with-cookie.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" appendRequestToHandler: true interfaceOnly: true useSpringBoot3: true \ No newline at end of file diff --git a/bin/configs/kotlin-spring-boot-sort-validation.yaml b/bin/configs/kotlin-spring-boot-sort-validation.yaml index 485233c40fad..827eaeedf8b3 100644 --- a/bin/configs/kotlin-spring-boot-sort-validation.yaml +++ b/bin/configs/kotlin-spring-boot-sort-validation.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-sort-validation.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-boot-source-swagger1.yaml b/bin/configs/kotlin-spring-boot-source-swagger1.yaml index 5a304d628e03..1a470a150fed 100644 --- a/bin/configs/kotlin-spring-boot-source-swagger1.yaml +++ b/bin/configs/kotlin-spring-boot-source-swagger1.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: source annotationLibrary: swagger1 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-source-swagger2.yaml b/bin/configs/kotlin-spring-boot-source-swagger2.yaml index 287d71be535c..94dfa2a58657 100644 --- a/bin/configs/kotlin-spring-boot-source-swagger2.yaml +++ b/bin/configs/kotlin-spring-boot-source-swagger2.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: source annotationLibrary: swagger2 useSwaggerUI: "true" diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml index 685c64a31c4d..1ee6f5030598 100644 --- a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: swagger1 useSwaggerUI: false diff --git a/bin/configs/kotlin-spring-boot.yaml b/bin/configs/kotlin-spring-boot.yaml index 0595d4243c28..0f930bf63998 100644 --- a/bin/configs/kotlin-spring-boot.yaml +++ b/bin/configs/kotlin-spring-boot.yaml @@ -4,6 +4,9 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NON_EMPTY" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-cloud.yaml b/bin/configs/kotlin-spring-cloud.yaml index b4185c2a38d7..9a2def41fa0f 100644 --- a/bin/configs/kotlin-spring-cloud.yaml +++ b/bin/configs/kotlin-spring-cloud.yaml @@ -4,6 +4,8 @@ library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-declarative-interface-bean-validation.yaml b/bin/configs/kotlin-spring-declarative-interface-bean-validation.yaml index 7c7ab0f17b21..227e9b360e95 100644 --- a/bin/configs/kotlin-spring-declarative-interface-bean-validation.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-bean-validation.yaml @@ -4,6 +4,8 @@ library: spring-declarative-http-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springDoc annotationLibrary: swagger2 useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml b/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml index e8df0fd8855c..ac35f26cb4bf 100644 --- a/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml @@ -4,6 +4,8 @@ library: spring-declarative-http-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springDoc annotationLibrary: swagger2 useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml b/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml index 1f16d8ec5dbc..431d1a9dc5f5 100644 --- a/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml @@ -4,6 +4,8 @@ library: spring-declarative-http-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springDoc annotationLibrary: swagger2 useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml b/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml index 01911f6a4b66..f8f5ec693cba 100644 --- a/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml @@ -4,6 +4,8 @@ library: spring-declarative-http-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springDoc annotationLibrary: swagger2 useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-declarative-interface.yaml b/bin/configs/kotlin-spring-declarative-interface.yaml index 5770ddafd8c8..1380afa9e362 100644 --- a/bin/configs/kotlin-spring-declarative-interface.yaml +++ b/bin/configs/kotlin-spring-declarative-interface.yaml @@ -4,6 +4,8 @@ library: spring-declarative-http-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springDoc annotationLibrary: swagger2 useSwaggerUI: "false" diff --git a/bin/configs/kotlin-spring-default.yaml b/bin/configs/kotlin-spring-default.yaml index 7cfefdc631cc..cb730f2d0f56 100644 --- a/bin/configs/kotlin-spring-default.yaml +++ b/bin/configs/kotlin-spring-default.yaml @@ -12,3 +12,7 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-spring # serializableModel: "true" # useBeanValidation: "true" # useSpringBoot3: "true" +additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NON_NULL" diff --git a/bin/configs/kotlin-spring-sealed-interfaces.yaml b/bin/configs/kotlin-spring-sealed-interfaces.yaml index c8d7123f65fb..f05100172f78 100644 --- a/bin/configs/kotlin-spring-sealed-interfaces.yaml +++ b/bin/configs/kotlin-spring-sealed-interfaces.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/kotlin-spring-sealed-interfaces inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" useSealedResponseInterfaces: true interfaceOnly: true dateLibrary: java8 diff --git a/bin/configs/spring-boot-3-include-http-request-context.yaml b/bin/configs/spring-boot-3-include-http-request-context.yaml index 23cfdcd9214b..de8f771cc8ca 100644 --- a/bin/configs/spring-boot-3-include-http-request-context.yaml +++ b/bin/configs/spring-boot-3-include-http-request-context.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/springboot-3-include-http-request-co inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot diff --git a/bin/configs/spring-boot-3.yaml b/bin/configs/spring-boot-3.yaml index 472f660ac7ab..37b8d2738f7d 100644 --- a/bin/configs/spring-boot-3.yaml +++ b/bin/configs/spring-boot-3.yaml @@ -3,6 +3,9 @@ outputDir: samples/openapi3/server/petstore/springboot-3 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NON_NULL" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot diff --git a/bin/configs/spring-boot-4-jspecify.yaml b/bin/configs/spring-boot-4-jspecify.yaml index 50b78bf923b8..cf5bf24d3a3e 100644 --- a/bin/configs/spring-boot-4-jspecify.yaml +++ b/bin/configs/spring-boot-4-jspecify.yaml @@ -5,6 +5,8 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring validateSpec: false additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc interfaceOnly: true diff --git a/bin/configs/spring-boot-4.yaml b/bin/configs/spring-boot-4.yaml index fee5258d9ceb..7506d17c8d26 100644 --- a/bin/configs/spring-boot-4.yaml +++ b/bin/configs/spring-boot-4.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/springboot-4 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot diff --git a/bin/configs/spring-boot-api-response-examples.yaml b/bin/configs/spring-boot-api-response-examples.yaml index e0b4196cc44d..b4acf09a2bdf 100644 --- a/bin/configs/spring-boot-api-response-examples.yaml +++ b/bin/configs/spring-boot-api-response-examples.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/api-response-examples_issue17610.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: springboot-api-response-examples documentationProvider: springdoc useSpringBoot3: true diff --git a/bin/configs/spring-boot-beanvalidation-no-nullable.yaml b/bin/configs/spring-boot-beanvalidation-no-nullable.yaml index 408849f7eec6..837ec15f1acd 100644 --- a/bin/configs/spring-boot-beanvalidation-no-nullable.yaml +++ b/bin/configs/spring-boot-beanvalidation-no-nullable.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 #documentationProvider: springdoc java8: "false" diff --git a/bin/configs/spring-boot-beanvalidation.yaml b/bin/configs/spring-boot-beanvalidation.yaml index 4a8904341cbd..0a49cca8f76c 100644 --- a/bin/configs/spring-boot-beanvalidation.yaml +++ b/bin/configs/spring-boot-beanvalidation.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" #documentationProvider: springdoc useSwaggerUI: false java8: true diff --git a/bin/configs/spring-boot-builtin-validation.yaml b/bin/configs/spring-boot-builtin-validation.yaml index 8a070a7f278e..e2e1bd25fb45 100644 --- a/bin/configs/spring-boot-builtin-validation.yaml +++ b/bin/configs/spring-boot-builtin-validation.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" #documentationProvider: springdoc useSwaggerUI: false java8: true diff --git a/bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml b/bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml index 18608bd41adf..a0feedc6f8f6 100644 --- a/bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml +++ b/bin/configs/spring-boot-defaultInterface-unhandledExcp.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/spring-boot-defaultInterface-unhandledExcp inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-boot-defaultInterface-unhandledException hideGenerationTimestamp: true java8: true diff --git a/bin/configs/spring-boot-delegate-j8.yaml b/bin/configs/spring-boot-delegate-j8.yaml index 1561840073a0..f0efd05a3117 100644 --- a/bin/configs/spring-boot-delegate-j8.yaml +++ b/bin/configs/spring-boot-delegate-j8.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-delegate-j8 inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" #documentationProvider: springdoc artifactId: springboot-delegate-j8 hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-delegate-no-response-entity.yaml b/bin/configs/spring-boot-delegate-no-response-entity.yaml index 13d062eb01c9..560d4db7aeaa 100644 --- a/bin/configs/spring-boot-delegate-no-response-entity.yaml +++ b/bin/configs/spring-boot-delegate-no-response-entity.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-delegate-no-response-entity inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" #documentationProvider: springdoc artifactId: springboot-delegate-no-response-entity hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-delegate-oas3.yaml b/bin/configs/spring-boot-delegate-oas3.yaml index 28ba653ad086..d0dc5546af85 100644 --- a/bin/configs/spring-boot-delegate-oas3.yaml +++ b/bin/configs/spring-boot-delegate-oas3.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/springboot-delegate inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot-delegate diff --git a/bin/configs/spring-boot-delegate.yaml b/bin/configs/spring-boot-delegate.yaml index 5edcca222c49..a05ba9a72e20 100644 --- a/bin/configs/spring-boot-delegate.yaml +++ b/bin/configs/spring-boot-delegate.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-delegate inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot-delegate hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-file-delegate-optional.yaml b/bin/configs/spring-boot-file-delegate-optional.yaml index 68c15c540431..9ac105b03460 100644 --- a/bin/configs/spring-boot-file-delegate-optional.yaml +++ b/bin/configs/spring-boot-file-delegate-optional.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-file-delegate-optional inputSpec: modules/openapi-generator/src/test/resources/3_0/issue18345.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" delegatePattern: true useOptional: true useSpringBoot3: true diff --git a/bin/configs/spring-boot-implicitHeaders-annotationLibrary.yaml b/bin/configs/spring-boot-implicitHeaders-annotationLibrary.yaml index 11dbb339bd95..68f75e49d4b4 100644 --- a/bin/configs/spring-boot-implicitHeaders-annotationLibrary.yaml +++ b/bin/configs/spring-boot-implicitHeaders-annotationLibrary.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-implicitHeaders-annotationLibrary inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: springboot-implicitHeaders-annotationLibrary documentationProvider: none annotationLibrary: none diff --git a/bin/configs/spring-boot-implicitHeaders-oas3.yaml b/bin/configs/spring-boot-implicitHeaders-oas3.yaml index 6d204b53c55e..9db0d986422a 100644 --- a/bin/configs/spring-boot-implicitHeaders-oas3.yaml +++ b/bin/configs/spring-boot-implicitHeaders-oas3.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/springboot-implicitHeaders inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc oas3: "true" diff --git a/bin/configs/spring-boot-implicitHeaders.yaml b/bin/configs/spring-boot-implicitHeaders.yaml index 7fae7e85daf0..d5b7187f3b5c 100644 --- a/bin/configs/spring-boot-implicitHeaders.yaml +++ b/bin/configs/spring-boot-implicitHeaders.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-implicitHeaders inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: springboot-implicitHeaders documentationProvider: springdoc hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-include-http-request-context.yaml b/bin/configs/spring-boot-include-http-request-context.yaml index a52eeaf879a7..4eedfe7957cb 100644 --- a/bin/configs/spring-boot-include-http-request-context.yaml +++ b/bin/configs/spring-boot-include-http-request-context.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-include-http-request-context inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot snapshotVersion: "true" diff --git a/bin/configs/spring-boot-lombok-data.yaml b/bin/configs/spring-boot-lombok-data.yaml index 57f54d71d3db..5125bfae5b12 100644 --- a/bin/configs/spring-boot-lombok-data.yaml +++ b/bin/configs/spring-boot-lombok-data.yaml @@ -3,6 +3,9 @@ outputDir: samples/server/petstore/springboot-lombok-data inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NON_EMPTY" groupId: org.openapitools.openapi3 artifactId: springboot-lombok-data hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-lombok-tostring.yaml b/bin/configs/spring-boot-lombok-tostring.yaml index 35d4e934eb82..666a16eb2f16 100644 --- a/bin/configs/spring-boot-lombok-tostring.yaml +++ b/bin/configs/spring-boot-lombok-tostring.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-lombok-tostring inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 artifactId: springboot-lombok-tostring hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-boot-oas3.yaml b/bin/configs/spring-boot-oas3.yaml index 1c4c87f19402..4e4e8abff336 100644 --- a/bin/configs/spring-boot-oas3.yaml +++ b/bin/configs/spring-boot-oas3.yaml @@ -3,6 +3,9 @@ outputDir: samples/openapi3/server/petstore/springboot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NONE" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot diff --git a/bin/configs/spring-boot-oneof-interface.yaml b/bin/configs/spring-boot-oneof-interface.yaml index a66a2c4bfc97..34d04736d56b 100644 --- a/bin/configs/spring-boot-oneof-interface.yaml +++ b/bin/configs/spring-boot-oneof-interface.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/spring-boot-oneof-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot-oneof diff --git a/bin/configs/spring-boot-oneof-sealed.yaml b/bin/configs/spring-boot-oneof-sealed.yaml index 83da74dc7c01..fbb14bf90b1b 100644 --- a/bin/configs/spring-boot-oneof-sealed.yaml +++ b/bin/configs/spring-boot-oneof-sealed.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/spring-boot-oneof-sealed inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot-oneof-sealed diff --git a/bin/configs/spring-boot-oneof.yaml b/bin/configs/spring-boot-oneof.yaml index f4a7ca7a99cc..98a8e2dd4dfc 100644 --- a/bin/configs/spring-boot-oneof.yaml +++ b/bin/configs/spring-boot-oneof.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/spring-boot-oneof inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: springboot-oneof diff --git a/bin/configs/spring-boot-paged-model.yaml b/bin/configs/spring-boot-paged-model.yaml index 5e0922688513..a9e3b91156e3 100644 --- a/bin/configs/spring-boot-paged-model.yaml +++ b/bin/configs/spring-boot-paged-model.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-paged-model.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/spring-boot-petstore-with-api-response-examples.yaml b/bin/configs/spring-boot-petstore-with-api-response-examples.yaml index 6a4604492b98..cc77cca4ddf7 100644 --- a/bin/configs/spring-boot-petstore-with-api-response-examples.yaml +++ b/bin/configs/spring-boot-petstore-with-api-response-examples.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore_with_api_response_examples.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: springboot-petstore-with-api-response-examples documentationProvider: springdoc useSpringBoot3: true diff --git a/bin/configs/spring-boot-reactive-noResponseEntity.yaml b/bin/configs/spring-boot-reactive-noResponseEntity.yaml index f69ad9806c5c..debb048ef2e5 100644 --- a/bin/configs/spring-boot-reactive-noResponseEntity.yaml +++ b/bin/configs/spring-boot-reactive-noResponseEntity.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-reactive-noResponseEntity inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 artifactId: springboot-reactive-noResponseEntity documentationProvider: springdoc diff --git a/bin/configs/spring-boot-reactive.yaml b/bin/configs/spring-boot-reactive.yaml index 5bc52f55edda..338a4ebaeedf 100644 --- a/bin/configs/spring-boot-reactive.yaml +++ b/bin/configs/spring-boot-reactive.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-reactive inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 artifactId: springboot-reactive documentationProvider: springdoc diff --git a/bin/configs/spring-boot-sort-validation.yaml b/bin/configs/spring-boot-sort-validation.yaml index c3c0cb1096e7..e2640306375b 100644 --- a/bin/configs/spring-boot-sort-validation.yaml +++ b/bin/configs/spring-boot-sort-validation.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-sort-validation.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none annotationLibrary: none useSwaggerUI: "false" diff --git a/bin/configs/spring-boot-source.yaml b/bin/configs/spring-boot-source.yaml index a1572c0e19c4..89d895c1960b 100644 --- a/bin/configs/spring-boot-source.yaml +++ b/bin/configs/spring-boot-source.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/springboot-source inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: source artifactId: springboot diff --git a/bin/configs/spring-boot-springdoc.yaml b/bin/configs/spring-boot-springdoc.yaml index fe479cd21e7f..cd15712ec7ca 100644 --- a/bin/configs/spring-boot-springdoc.yaml +++ b/bin/configs/spring-boot-springdoc.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/server/petstore/spring-boot-springdoc inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc useSwaggerUI: false diff --git a/bin/configs/spring-boot-useoptional.yaml b/bin/configs/spring-boot-useoptional.yaml index daf57fe87351..428935c9bdd7 100644 --- a/bin/configs/spring-boot-useoptional.yaml +++ b/bin/configs/spring-boot-useoptional.yaml @@ -3,6 +3,9 @@ outputDir: samples/server/petstore/springboot-useoptional inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" + optionalNonNullPropertyJsonInclude: "NON_DEFAULT" groupId: org.openapitools.openapi3 #documentationProvider: springdoc useOptional: true diff --git a/bin/configs/spring-boot-virtualan.yaml b/bin/configs/spring-boot-virtualan.yaml index 87a2e30fb91a..526888c6ecef 100644 --- a/bin/configs/spring-boot-virtualan.yaml +++ b/bin/configs/spring-boot-virtualan.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc apiPackage: org.openapitools.virtualan.api modelPackage: org.openapitools.virtualan.model diff --git a/bin/configs/spring-boot-x-implements-skip.yaml b/bin/configs/spring-boot-x-implements-skip.yaml index a56794db3de8..66a2340a9cf3 100644 --- a/bin/configs/spring-boot-x-implements-skip.yaml +++ b/bin/configs/spring-boot-x-implements-skip.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot-x-implements-skip inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-x-implements.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" additionalNotNullAnnotations: true documentationProvider: springdoc artifactId: springboot diff --git a/bin/configs/spring-boot.yaml b/bin/configs/spring-boot.yaml index 9464c18594ec..aafaea71da4f 100644 --- a/bin/configs/spring-boot.yaml +++ b/bin/configs/spring-boot.yaml @@ -3,6 +3,8 @@ outputDir: samples/server/petstore/springboot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot snapshotVersion: "true" diff --git a/bin/configs/spring-cloud-3-with-optional.yaml b/bin/configs/spring-cloud-3-with-optional.yaml index 7efd4ce223e0..de47cf1cf270 100644 --- a/bin/configs/spring-cloud-3-with-optional.yaml +++ b/bin/configs/spring-cloud-3-with-optional.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud-3-with-optional inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 artifactId: spring-cloud-oas3 useSpringBoot3: "true" diff --git a/bin/configs/spring-cloud-3.yaml b/bin/configs/spring-cloud-3.yaml index 18e3797f0ca3..ce03369d6208 100644 --- a/bin/configs/spring-cloud-3.yaml +++ b/bin/configs/spring-cloud-3.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud-3 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-oas3 diff --git a/bin/configs/spring-cloud-4-with-optional.yaml b/bin/configs/spring-cloud-4-with-optional.yaml index 1e474a40a122..10649fe8604f 100644 --- a/bin/configs/spring-cloud-4-with-optional.yaml +++ b/bin/configs/spring-cloud-4-with-optional.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud-4-with-optional inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-oas4 diff --git a/bin/configs/spring-cloud-async-oas3.yaml b/bin/configs/spring-cloud-async-oas3.yaml index 01e4dc6ce4db..ecd0cdf03481 100644 --- a/bin/configs/spring-cloud-async-oas3.yaml +++ b/bin/configs/spring-cloud-async-oas3.yaml @@ -4,6 +4,8 @@ library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc async: "true" diff --git a/bin/configs/spring-cloud-auth.yaml b/bin/configs/spring-cloud-auth.yaml index 88c2e399b892..0d559d7dcd57 100644 --- a/bin/configs/spring-cloud-auth.yaml +++ b/bin/configs/spring-cloud-auth.yaml @@ -4,6 +4,8 @@ library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-auth.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: none artifactId: petstore-spring-cloud-auth hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-cloud-date-time-oas3.yaml b/bin/configs/spring-cloud-date-time-oas3.yaml index 8574b519edfb..1bdffc887298 100644 --- a/bin/configs/spring-cloud-date-time-oas3.yaml +++ b/bin/configs/spring-cloud-date-time-oas3.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud-date-time inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-date-time-oas3 diff --git a/bin/configs/spring-cloud-date-time.yaml b/bin/configs/spring-cloud-date-time.yaml index 14c7e3361f31..58f80a88c883 100644 --- a/bin/configs/spring-cloud-date-time.yaml +++ b/bin/configs/spring-cloud-date-time.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-cloud-date-time inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: spring-cloud-date-time interfaceOnly: "true" diff --git a/bin/configs/spring-cloud-deprecated-oas3.yaml b/bin/configs/spring-cloud-deprecated-oas3.yaml index b6d1943ce7ab..921d2a38a336 100644 --- a/bin/configs/spring-cloud-deprecated-oas3.yaml +++ b/bin/configs/spring-cloud-deprecated-oas3.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-cloud-deprecated inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-deprecated diff --git a/bin/configs/spring-cloud-http-basic-only.yaml b/bin/configs/spring-cloud-http-basic-only.yaml index b6ff990b7963..13354e58cdfd 100644 --- a/bin/configs/spring-cloud-http-basic-only.yaml +++ b/bin/configs/spring-cloud-http-basic-only.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud-http-basic inputSpec: modules/openapi-generator/src/test/resources/3_0/http-basic-test.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-http-basic diff --git a/bin/configs/spring-cloud-oas3-fakeapi.yaml b/bin/configs/spring-cloud-oas3-fakeapi.yaml index b4582cbe1c06..7be9c1fbc701 100644 --- a/bin/configs/spring-cloud-oas3-fakeapi.yaml +++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-oas3 diff --git a/bin/configs/spring-cloud-oas3.yaml b/bin/configs/spring-cloud-oas3.yaml index 4e07871206f1..1c4679fdaa1a 100644 --- a/bin/configs/spring-cloud-oas3.yaml +++ b/bin/configs/spring-cloud-oas3.yaml @@ -4,6 +4,8 @@ outputDir: samples/openapi3/client/petstore/spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-oas3 diff --git a/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml b/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml index b130111f0e0d..afa0848f4ba1 100644 --- a/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml +++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml @@ -4,6 +4,8 @@ library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-cloud-spring-pageable diff --git a/bin/configs/spring-cloud-petstore-feign-without-url-param.yaml b/bin/configs/spring-cloud-petstore-feign-without-url-param.yaml index dc342f51ad8e..0300fa35258a 100644 --- a/bin/configs/spring-cloud-petstore-feign-without-url-param.yaml +++ b/bin/configs/spring-cloud-petstore-feign-without-url-param.yaml @@ -4,6 +4,8 @@ library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: petstore-spring-cloud hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-cloud-tags.yaml b/bin/configs/spring-cloud-tags.yaml index 8fad04c73760..524c25f253d2 100644 --- a/bin/configs/spring-cloud-tags.yaml +++ b/bin/configs/spring-cloud-tags.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-cloud-tags inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-tags.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" #documentationProvider: springdoc artifactId: spring-cloud-date-time interfaceOnly: "true" diff --git a/bin/configs/spring-cloud.yaml b/bin/configs/spring-cloud.yaml index b4a75a6391f5..a93b0924aa76 100644 --- a/bin/configs/spring-cloud.yaml +++ b/bin/configs/spring-cloud.yaml @@ -4,6 +4,8 @@ library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" #documentationProvider: springdoc artifactId: petstore-spring-cloud hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-bean-validation.yaml b/bin/configs/spring-http-interface-bean-validation.yaml index 9d3aca960b59..4da1d4cb1769 100644 --- a/bin/configs/spring-http-interface-bean-validation.yaml +++ b/bin/configs/spring-http-interface-bean-validation.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-bean-validation inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-noResponseEntity.yaml b/bin/configs/spring-http-interface-noResponseEntity.yaml index 098c5ebf7598..b9614043cd45 100644 --- a/bin/configs/spring-http-interface-noResponseEntity.yaml +++ b/bin/configs/spring-http-interface-noResponseEntity.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-noResponseEntity inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface-noResponseEntity snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-oauth.yaml b/bin/configs/spring-http-interface-oauth.yaml index ef6e29eade40..36d44dfaae8b 100644 --- a/bin/configs/spring-http-interface-oauth.yaml +++ b/bin/configs/spring-http-interface-oauth.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-oauth inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface-oauth-petstore snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-reactive-bean-validation.yaml b/bin/configs/spring-http-interface-reactive-bean-validation.yaml index 6040068f931b..1929a918c2e8 100644 --- a/bin/configs/spring-http-interface-reactive-bean-validation.yaml +++ b/bin/configs/spring-http-interface-reactive-bean-validation.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-reactive-bean-validatio inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface-reactive snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-reactive-noResponseEntity.yaml b/bin/configs/spring-http-interface-reactive-noResponseEntity.yaml index e572fc5188e8..961fbeb5cdc2 100644 --- a/bin/configs/spring-http-interface-reactive-noResponseEntity.yaml +++ b/bin/configs/spring-http-interface-reactive-noResponseEntity.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-reactive-noResponseEnti inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface-reactive-noResponseEntity snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-reactive.yaml b/bin/configs/spring-http-interface-reactive.yaml index 1a289063f6bd..f7397c1788c8 100644 --- a/bin/configs/spring-http-interface-reactive.yaml +++ b/bin/configs/spring-http-interface-reactive.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-reactive inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface-reactive snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-springboot-4.yaml b/bin/configs/spring-http-interface-springboot-4.yaml index e9cee278abc9..60d458548d0e 100644 --- a/bin/configs/spring-http-interface-springboot-4.yaml +++ b/bin/configs/spring-http-interface-springboot-4.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-springboot-4 inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration.yaml b/bin/configs/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration.yaml index 1d50b034c7ae..cd6c66e38bea 100644 --- a/bin/configs/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration.yaml +++ b/bin/configs/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface-useHttpServiceProxyFact inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-http-interface.yaml b/bin/configs/spring-http-interface.yaml index bc6bf36e5123..4051bb3afeb4 100644 --- a/bin/configs/spring-http-interface.yaml +++ b/bin/configs/spring-http-interface.yaml @@ -4,6 +4,8 @@ outputDir: samples/client/petstore/spring-http-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-http-interface snapshotVersion: "true" hideGenerationTimestamp: "true" diff --git a/bin/configs/spring-nullable-set.yaml b/bin/configs/spring-nullable-set.yaml index 64122c7cf3c8..d186d5f6f382 100644 --- a/bin/configs/spring-nullable-set.yaml +++ b/bin/configs/spring-nullable-set.yaml @@ -4,6 +4,8 @@ outputDir: samples/server/petstore/spring-boot-nullable-set inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/10167-nullable-set.yml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: spring-boot-nullable-set interfaceOnly: "true" singleContentTypes: "true" diff --git a/bin/configs/spring-stubs-oas3.yaml b/bin/configs/spring-stubs-oas3.yaml index c37ba7e3c3c2..b2f927457512 100644 --- a/bin/configs/spring-stubs-oas3.yaml +++ b/bin/configs/spring-stubs-oas3.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/client/petstore/spring-stubs inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-stubs diff --git a/bin/configs/spring-stubs-skip-default-interface.yaml b/bin/configs/spring-stubs-skip-default-interface.yaml index 43d4dd080898..e18dd66ed804 100644 --- a/bin/configs/spring-stubs-skip-default-interface.yaml +++ b/bin/configs/spring-stubs-skip-default-interface.yaml @@ -3,6 +3,8 @@ outputDir: samples/openapi3/client/petstore/spring-stubs-skip-default-interface inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" groupId: org.openapitools.openapi3 documentationProvider: springdoc artifactId: spring-stubs diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml index 056714c4f230..b52b6da47336 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml @@ -6,6 +6,8 @@ templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true java8: false additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot-spring-pageable-delegatePattern-without-j8 hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml index 980dab683b8f..c41cb5a1eb12 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml @@ -5,6 +5,8 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot-spring-pageable-delegatePattern hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml index 4d7feb4fadc3..4ac75381902b 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml @@ -5,6 +5,8 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with templateDir: modules/openapi-generator/src/main/resources/JavaSpring java8: false additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot-spring-pageable-withoutj8 hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable.yaml b/bin/configs/springboot-petstore-server-spring-pageable.yaml index 85dadcac577c..3f48b041c094 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml @@ -4,6 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" documentationProvider: springdoc artifactId: springboot-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-provide-args.yaml b/bin/configs/springboot-petstore-server-spring-provide-args.yaml index 09ed7ec421be..b1afd47a7095 100644 --- a/bin/configs/springboot-petstore-server-spring-provide-args.yaml +++ b/bin/configs/springboot-petstore-server-spring-provide-args.yaml @@ -4,5 +4,7 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-provide-args.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + generateJsonIncludeAnnotations: "true" + generateJsonSetterNullsAnnotations: "true" artifactId: springboot-spring-provide-args hideGenerationTimestamp: 'true' 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 bf8f8eb792e3..83c89d9c9800 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; @@ -28,22 +29,30 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 4045165cbcdb..74019567a021 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.25.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 a2f0f03becca..53b64044c6e3 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,15 +30,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable name = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) @Deprecated private List photoUrls = new ArrayList<>(); + @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) 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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 28e0b05c9442..1268109b1c52 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 d50008b0cc77..141ad532407c 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +82,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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 56fabc4802f2..3665a31120b1 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.25.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 9ee262b57a0d..88db835bec6e 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.25.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 9059f36e9d72..b4ff49b47180 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.25.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 16528218f0d3..fb95071ae45f 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.25.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 ef52762719a5..93c202cbb8e2 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.25.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 02ad45d74984..f046c66ab55f 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.25.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 120fb59f5f18..16220457f32d 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.25.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 249877c4ac70..4dd1893a48ce 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.25.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 4e3062b2339a..ccfe65d189e1 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 9ed8d118da44..692519fbf52b 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.25.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 880c523df38c..1302d3c84ad6 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.25.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 edb22d6166cb..656e2d802f3b 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.25.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 d73667ee4139..802a19d1f683 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.25.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 90e467b21144..2efdf75f4ebe 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 86cbe2870435..310065b7a9cf 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.25.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 6604e25ffd46..9e0248241d2b 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.25.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 20132c1f51e1..44a1a1ea0b01 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,8 +24,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 b5549b48f767..e04fac3f7eff 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.25.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 c63747c03fa1..d47ae0891d92 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.25.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 0277b2fe9dbb..7e6f894682b3 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.25.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/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 21bcc6d948d3..d88271c2bf46 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,8 +31,10 @@ public class ContainerDefaultValueDto { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 e4db70c81934..10728f3d3b60 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.25.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 fa197fad8b91..993a1e525a32 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 4483d86c8642..250a8a7fa9fb 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; /** @@ -101,6 +103,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -138,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,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/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 16c8a91e0a4a..f50352c73c68 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.25.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 c91111f68845..eb7d6e45c9f5 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.25.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 998483b87e0e..0db61103ab8a 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 d8371c307a43..622239efc34b 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.25.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 b10a710ea30f..450d878f9685 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.25.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 5892bb2e67c5..bea5213283f1 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.25.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 f69d90792b3b..185e777b68e9 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.25.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 0055e3f81a92..93562f811e40 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.25.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 ffaad2017fff..9dcea8d6c27b 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 05a0b2fdacc9..d57f881929e2 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.25.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 6cf3f0ec9582..e3a6bf686e3c 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.25.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 e9fa368f7e5e..195878eda8fa 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.25.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 abeb9594e476..cb3f764522a6 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 8cd0c20a71c9..b4eda9e7f9c4 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; 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 8d25a87c9c9c..b03a4f653297 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.25.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 db7d8fe8b484..1d6bae89fcdf 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.25.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 e4d5efd1db0b..d3d626a4f1ba 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.25.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 01b9ddbe8d7c..808132e8b525 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.25.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 8a3b896dbb97..0c2083bc7dee 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.25.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/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 99d18a336d78..a1c213eb40de 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +28,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index b0faf5aaa9ae..b0f401268821 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +28,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 85967f9e6df4..07f79932b35c 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.25.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 92aad3dca4d9..affdf6c95811 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.25.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 780016597836..3937b4be3e83 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.25.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 4d7bc9d2cd7e..14c946e79f89 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.25.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 57935b018396..8446d9313251 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.25.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 c3a8d46a2eba..613b36dd183c 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.25.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 1ba709922615..58cef91c05f9 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.25.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 3cf52be09aff..32f8cefee8e0 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.25.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 12d8b2dd8680..02b49f9390c0 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.25.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 34cd1d0a8987..4fa06b4dd21b 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.25.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 d59b297318fa..67474f01ec05 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 22b52d28adf0..557c82088717 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.25.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 fb35e1e2bcb2..3b7cdb677828 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.25.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 272e46368765..bf82c3edbd20 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.25.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 78072e14c990..f55a0364cdd8 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.25.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 819aeec7a44c..7206109c7d20 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 1dbd505badcb..f76eec0f4aa4 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.25.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 b67d9c5afaac..b35debc9fe14 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.25.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 2dfd17aa2690..ca80887aed58 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 a289d93db4e9..1931d0ee7cd0 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.25.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 d37dc45bb056..970c6a6d06d1 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.25.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 1ce2cf86a595..b021a9d4e456 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.25.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/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 47650e48a8d1..fe0be24e229d 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,8 +30,10 @@ public class ContainerDefaultValueDto { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1de67f7c0d3f..f55f17cc56c7 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.25.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 b7c106960439..e214b9a22a55 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 4f4d9b5821bb..5069a1a9acbb 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; /** @@ -100,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -137,6 +140,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,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-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 353093dd0728..a451866b8b42 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.25.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 bf0ddb1209d2..b314f4c2fa55 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.25.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 a6302f7c15c0..c68a2728bcb1 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 9c9a31829b61..cab79bbdd7de 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.25.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 6098f5f5c7e7..a1ca411799d9 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.25.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 eb27dd2f2854..e6325f452fa3 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.25.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 e399a462a232..c8789eabac80 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.25.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 3013c106da9c..5e0afafe3770 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.25.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 6f3aeed1db4f..b6b48d488ede 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; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 0390e8d4d1ff..41ad288217eb 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.25.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 20c1058e1c1e..77d035a18c6f 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.25.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 dbb746cdd42d..054320f31690 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.25.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 0e20fd2c2156..af08c71fb48f 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 4e1818acd0ba..791eea25f843 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -78,6 +84,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 49fc8522cb61..f0364f51c6e0 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.25.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 1d58f2e9ee4a..b33e49d5fdca 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.25.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 97b51b0d19be..e13804a7a1a7 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.25.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 c012011c1225..f51104c163d7 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.25.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 36f6c923d9f7..81ed0e519fbf 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.25.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/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 987983e43451..8ca218f8c704 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 4db40f3db382..eea548352cc7 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 7fc03feb74bb..146f36a6e6a7 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.25.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 8003bf2ed10f..e6e5ee477df6 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.25.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 6e01176c858a..60c38d69c87f 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public CategoryDto id(@Nullable Long id) { 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 16d8830ad6ef..6a6e87714952 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,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List tags = new ArrayList<>(); /** @@ -74,6 +85,8 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @Deprecated private @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 aea153b010ce..9f054df0c7c2 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public TagDto id(@Nullable Long id) { 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 d856ddfb89fa..3c7ce4545e27 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.25.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 6838b73d9dd2..14b412c88e43 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.25.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 2d61f0549ab1..fb214041a183 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.25.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 a68df6caa20f..d143dbf68f9c 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.25.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 b735cd0533f6..b214aaec6716 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.25.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 ad35b01b1bee..af3f8b4cf7f3 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.25.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 c902dbffa201..618ea195e964 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.25.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 7b4148dffa45..f683525f4593 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.25.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 b89151fc0328..fe52d0aa116a 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 cf8455ed01ec..1efee220f79c 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.25.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 7626e5d8202a..e11670fd8583 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.25.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 292ea37fa0f2..12bba4684f17 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.25.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 b771061ee3f4..6b56b13145d3 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 c3b7e41d404c..8716cdb5a027 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.25.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 b487150af485..9d2d4f85717e 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.25.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 90080cef8e2d..a606369f1c61 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,8 +22,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 b7b216bd0236..2479364db7a7 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.25.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 d633e777344e..fc163e21c3ef 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.25.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 90c95cef8ea3..55e771ca467d 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.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 7c343ea96b27..ca932fee5f0f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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 ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 3d0180f01192..87dcca204cf9 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.25.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 8790dbd02f58..a2944244688e 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 b010f75437cf..58945182bd97 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; /** @@ -101,6 +103,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -138,6 +141,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,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-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 4a3d777136d9..84a803012fbc 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.25.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 b84d2b2d65db..81c9051dedbc 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.25.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 7007dae14520..fe3df02f9da4 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 58b6d6e76f5e..6e7692c14ae3 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.25.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 6bb6c1aed323..a1efb10089a8 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.25.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 dcba61d10b27..1fb2d7e1681f 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.25.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 9a6def1673a7..18ba5e0817d1 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.25.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 7122baa8ced0..99dd4cb2346a 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.25.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 6e6fd553311c..6a301e90066d 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.25.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 87e36f32f3e9..ba61ceca8a5f 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.25.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 d3c90dbae169..1edf0813d0b5 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; @@ -21,12 +22,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 23e94dfe3ce0..5101f61ad25b 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.25.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 290d9fe2c833..94ca262ac9d5 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.25.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 510f8ad776a9..e25f604bf796 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.25.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 a4b4ca303fe5..9b895427687b 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 f54dcf1785b1..2e84df56c536 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; 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 c9ee65de0da6..70d56774fa5c 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.25.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 1c7b5af1c5b5..42f5ebb3fa30 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.25.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 ae49a208c813..57fc0a0a7414 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.25.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 9147a7f99437..82ac9d8ad4bd 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.25.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/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 1f8e4dc3d890..7aedd82ea28e 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +26,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java index d37cdc713ec3..f1609752ba2f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +26,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a14a5445fa58..beb8249ba62a 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.25.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 0da0151b20f7..8f0711631a8c 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.25.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 9c4beba4c0b5..e960421a7b2e 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.25.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 b83621e3c5c5..0cffd89751f9 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.25.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 0386839d7e65..7ea192986d4b 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.25.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 2c0ea1e64719..b266f37f4576 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.25.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 a9a6302ca222..c86f74b0f1e5 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.25.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 9f17a2283e15..5ed04a539f34 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.25.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 359b80444763..2876505e1ca9 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.25.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 19de8e523b88..e8d36bc80c75 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.25.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 dd595f439b98..29ecd6ae4724 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; @@ -34,8 +35,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 00774785274e..cb11751ae30d 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.25.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 755f93d5edff..b4753f3aac27 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.25.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 05cd27a19455..7a515da44b10 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.25.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 09192bf258ce..ccf15a03d444 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 1fec8e311e94..92061bc6c11c 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.25.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 b69226e8f6d4..14b7e59f604d 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.25.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 765b47c02930..dd15acc4171f 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,8 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 582981a9138b..68a2012819e0 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.25.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 87058382ca6a..40e0c7d71b19 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.25.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 6f82a123ec9b..da56b8e5ac2c 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.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a739b2a500c..31a8133cb94f 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,8 +28,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 7df35b5581f7..0b2f171a2c81 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.25.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 2f8c2b3e34a4..dddcfc03ff99 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 7c7d44cc8cf4..07926663552d 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; /** @@ -100,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -137,6 +140,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,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-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 440dbb1eed22..b04070c5895c 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.25.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 7869c8d9f087..a35c6f92fc61 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.25.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 c1c5c8e43024..f4aea008dfa3 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 d4f48136cd24..5cfebe0f0330 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.25.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 d9bb5b2251fc..f051906c8fa6 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.25.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 3cc4a34993e2..16bfe9107739 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.25.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 625aaa685333..d4213ff3ec76 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.25.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 174656b8beb7..f450a55105cd 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.25.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 100731ee348e..fc38b804638a 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.25.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 ce019ef96625..5efb23330e2c 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.25.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 01239ad1825e..5be398a7e1c9 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; @@ -20,12 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 22da19e4462b..1fe9d565f928 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.25.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 d9aed984c327..15aa52365118 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.25.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 7e270ad6e0b9..5453a6b4f052 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.25.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 aaeca7c426ec..a2e4fd94701a 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 f6cf21bbef92..906fa96ae1ee 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -76,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-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 9f4d986e0e24..74c2b0d529b4 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.25.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 d1ebb58dbd72..71106ba573b9 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.25.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 c5738d0b4c35..d009a7a1faa0 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.25.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 abe6da736d2c..db9486dc1ab4 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.25.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/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4bf6cba777df..e8978ec83178 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +25,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java index 5e77ca347711..4caccae69640 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a4c48f51d92b..25e08a524514 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.25.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 3c7d8238f334..058a67331ca7 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.25.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 9c4beba4c0b5..e960421a7b2e 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.25.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 b83621e3c5c5..0cffd89751f9 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.25.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 0386839d7e65..7ea192986d4b 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.25.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 2c0ea1e64719..b266f37f4576 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.25.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 a9a6302ca222..c86f74b0f1e5 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.25.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 9f17a2283e15..5ed04a539f34 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.25.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 359b80444763..2876505e1ca9 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.25.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 19de8e523b88..e8d36bc80c75 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.25.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 dd595f439b98..29ecd6ae4724 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; @@ -34,8 +35,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 00774785274e..cb11751ae30d 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.25.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 755f93d5edff..b4753f3aac27 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.25.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 05cd27a19455..7a515da44b10 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.25.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 09192bf258ce..ccf15a03d444 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 1fec8e311e94..92061bc6c11c 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.25.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 b69226e8f6d4..14b7e59f604d 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.25.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 765b47c02930..dd15acc4171f 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,8 +21,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 582981a9138b..68a2012819e0 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.25.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 87058382ca6a..40e0c7d71b19 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.25.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 6f82a123ec9b..da56b8e5ac2c 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.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 4a739b2a500c..31a8133cb94f 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -27,8 +28,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 7df35b5581f7..0b2f171a2c81 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.25.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 2f8c2b3e34a4..dddcfc03ff99 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 7c7d44cc8cf4..07926663552d 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; /** @@ -100,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -137,6 +140,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,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/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 440dbb1eed22..b04070c5895c 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.25.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 7869c8d9f087..a35c6f92fc61 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.25.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 c1c5c8e43024..f4aea008dfa3 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 d4f48136cd24..5cfebe0f0330 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.25.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 d9bb5b2251fc..f051906c8fa6 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.25.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 3cc4a34993e2..16bfe9107739 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.25.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 625aaa685333..d4213ff3ec76 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.25.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 174656b8beb7..f450a55105cd 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.25.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 100731ee348e..fc38b804638a 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.25.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 ce019ef96625..5efb23330e2c 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.25.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 01239ad1825e..5be398a7e1c9 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; @@ -20,12 +21,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 22da19e4462b..1fe9d565f928 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.25.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 d9aed984c327..15aa52365118 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.25.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 7e270ad6e0b9..5453a6b4f052 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.25.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 aaeca7c426ec..a2e4fd94701a 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 f6cf21bbef92..906fa96ae1ee 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -76,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-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 9f4d986e0e24..74c2b0d529b4 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.25.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 d1ebb58dbd72..71106ba573b9 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.25.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 c5738d0b4c35..d009a7a1faa0 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.25.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 abe6da736d2c..db9486dc1ab4 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.25.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/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 4bf6cba777df..e8978ec83178 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +25,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 5e77ca347711..4caccae69640 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +25,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a4c48f51d92b..25e08a524514 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.25.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 3c7d8238f334..058a67331ca7 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.25.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 bc9bceb063b8..295d6b496a00 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesAnyTypeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesAnyTypeDto name(@Nullable String 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 981cec3ab093..1af5c4e3e427 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesArrayDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesArrayDto name(@Nullable String 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 365dc34333fd..5186257ff7e9 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesBooleanDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesBooleanDto name(@Nullable String 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 df78eacb128d..a8a585b40488 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,46 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Object anytype1; private @Nullable Object anytype2 = null; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Object anytype3; public AdditionalPropertiesClassDto mapString(Map mapString) { 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 bffa29295750..5953b7ef4a6f 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesIntegerDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesIntegerDto name(@Nullable String 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 183e40479a62..5e1fd8bb52cb 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesNumberDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesNumberDto name(@Nullable String 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 d22956854bdc..e074be7e9fc1 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesObjectDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesObjectDto name(@Nullable String 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 e9ef30b6d856..7f2716e810b8 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesStringDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesStringDto name(@Nullable String 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 f052d224f99f..4accd0918d94 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; @@ -36,8 +39,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String color = "red"; public AnimalDto() { 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 f8e1337a4ab9..1a2565b3fd59 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ApiResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String message; public ApiResponseDto code(@Nullable Integer code) { 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 3c2e36d290e5..5ffe266b5d11 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List> 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 8df81da118a1..e2e197848a86 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnlyDto arrayNumber(List 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 aac3d40b5291..9f9cd29a27ce 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTestDto arrayOfString(List arrayOfString) { 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 58f86163cbad..0157f3f90a5e 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,8 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable KindEnum kind; public BigCatDto() { 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 74e40bf70cb2..b8cd114ab05d 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,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CapitalizationDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String ATT_NAME; public CapitalizationDto smallCamel(@Nullable String smallCamel) { 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 2c3ca34c64b8..8cc3ac72727a 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CatDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean declawed; public CatDto() { 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 2338ce3f1430..d594d20b7040 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,8 +26,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 0a8721d2304b..e8052ff73150 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ChildWithNullableDto extends ParentWithNullableDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String otherProperty; public ChildWithNullableDto otherProperty(@Nullable String 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 c779c49bdd99..4946321f4ff8 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ClassModelDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String propertyClass; public ClassModelDto propertyClass(@Nullable String 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 2cb41758dc8e..d1e32d687f45 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ClientDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String client; public ClientDto client(@Nullable String client) { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index b28ffec6be94..b5627e929b6b 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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 @@ public class ContainerDefaultValueDto { private @Nullable List nullableArray; + @JsonInclude(JsonInclude.Include.ALWAYS) private List nullableRequiredArray; + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private @Nullable List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); 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 ec0f2957181f..f5208d6b9613 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class DogDto extends AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String breed; public DogDto() { 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 b37c52c60201..1a573e6b8d0e 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,8 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable JustSymbolEnum justSymbol; /** @@ -99,6 +104,8 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List arrayEnum = new ArrayList<>(); public EnumArraysDto justSymbol(@Nullable JustSymbolEnum justSymbol) { 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 0654af44be82..875ed5bc644b 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,8 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable EnumStringEnum enumString; /** @@ -101,6 +106,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -138,6 +144,8 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,8 +183,12 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable OuterEnumDto outerEnum; public EnumTestDto() { 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 2c8f7e4ab072..aa14224caf89 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String sourceURI; public FileDto sourceURI(@Nullable String 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 66defbf33514..158f346707f0 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable FileDto file; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List<@Valid FileDto> files = new ArrayList<>(); public FileSchemaTestClassDto file(@Nullable FileDto file) { 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 9558d457cb1e..841e6c4ff31c 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,58 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FormatTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal bigDecimal; public FormatTestDto() { 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 8f53bf0c3643..a4d5ad3f5be1 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class HasOnlyReadOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String foo; public HasOnlyReadOnlyDto bar(@Nullable String bar) { 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 ac54df166790..6d00c022246a 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ListDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String _123list; public ListDto _123list(@Nullable String _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 1894246433e9..5cf480833005 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTestDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapMapOfString = new HashMap<>(); /** @@ -63,10 +68,16 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map indirectMap = new HashMap<>(); public MapTestDto mapMapOfString(Map> mapMapOfString) { 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 6077b0b38c7c..900a1ee469b4 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,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClassDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { 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 8edaa25804e5..f88e19f2aa90 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Model200ResponseDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String propertyClass; public Model200ResponseDto name(@Nullable Integer name) { 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 9fbcdb2a7def..3ef8f8bb33c2 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; @@ -23,12 +26,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer _123number; public NameDto() { 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 75633c719667..34b93588f32c 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NumberOnlyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal justNumber; public NumberOnlyDto justNumber(@Nullable BigDecimal 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 c0fdbfb69ff4..08c1defb229f 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,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class OrderDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -72,8 +83,12 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Boolean complete = false; public OrderDto id(@Nullable Long id) { 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 e3353d6b0464..ec6558982ce0 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class OuterCompositeDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean myBoolean; public OuterCompositeDto myNumber(@Nullable BigDecimal myNumber) { 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 83e19df5a8c2..e28ac8d9ab82 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,8 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable TypeEnum type; private @Nullable String nullableProperty = null; 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 1af5c0127668..9131504ef497 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,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -79,6 +90,8 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @Deprecated private @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 db0766501e6a..0038c0006934 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ReadOnlyFirstDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String baz; public ReadOnlyFirstDto bar(@Nullable String bar) { 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 53d95b70a2d2..540124366238 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,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNamesDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(@Nullable String normalPropertyName) { 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 b4a996899f85..d5cca17c65a9 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ReturnDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer _return; public ReturnDto _return(@Nullable Integer _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 c9a8814f466b..bed961337881 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class SpecialModelNameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long $specialPropertyName; public SpecialModelNameDto $specialPropertyName(@Nullable Long $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 778f22acdb37..a3bed1aa2cab 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TagDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public TagDto id(@Nullable Long id) { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index e92f8c79ef5f..c0325225555f 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +28,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 0400294f91bc..522e6a5f3520 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +28,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 1c62c7a686ef..8f158989a646 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,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class UserDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer userStatus; public UserDto id(@Nullable Long id) { 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 2d5e2d7d5af6..4f0e84c89802 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,120 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class XmlItemDto { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItemDto attributeString(@Nullable String attributeString) { 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 0d805693483a..124842816779 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.25.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 f6e19548507d..4f84cb935113 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.25.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 d609a8a93d2f..fbf2aed4574b 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.25.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 7776dc10e551..a3e051349288 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.25.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 a4ac3b11d1d8..45cf0b07ea5c 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.25.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 8563990118de..afa798720a53 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.25.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 25a1633f222d..65a68c9903a5 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.25.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 3065ea27bffb..b6fe3c7b55d4 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.25.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 f5f66f38664f..e4e0790b3e92 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 5be58e0f7e29..2f035d99c5cb 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.25.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 4673fcfb44c0..0f421a4df7e0 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.25.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 a1af40c03a26..554b15ab3cf0 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.25.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 11a62056d0b4..c2a8c6f3157a 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 6e1739acb5c2..0c782403899d 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.25.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 514eaf8f4542..41de3f00a15f 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.25.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 5c12a6ef13a0..3455dcf8b80b 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 1ec5151968d1..b75f13dec63d 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.25.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 5e19fd32b228..b4a5b229735a 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.25.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 2537e7860263..ab82f0b7875a 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.25.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/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 7d10b0d2be3a..219aeb0cd0ed 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 7516ed27426e..f5c6d012b5d5 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.25.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 65e6de5132b3..c5e33007e200 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 89f556d62e0a..671101c3ca77 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 a04bdd0a513e..9bbef1dd181a 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.25.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 34e36d2ed07d..0eee22443042 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.25.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 2e5407a84750..17566a89eeda 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 23d9b5b230ef..32ff5875653f 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.25.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 8879d27b85a2..00158afc58e2 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.25.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 952d468df1fa..b815102e433a 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.25.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 e7a0b038f219..0e06b0996d7d 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.25.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 9621a403daba..a7e8a5527796 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.25.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 46140cddd75d..42912f6c62d2 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.25.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 e9321a52ab25..a9ec3b39d649 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.25.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 e1dbfae7b478..aa4b273b332e 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; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 492a15cb3251..da0887c1a0a4 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.25.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 8ece8c404d47..5ae7eff7c3dc 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.25.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 ed9620ca1178..3649750a3036 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.25.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 fd22481c46c1..fde0586fa40c 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 549fb440b002..a879f5ebd770 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +84,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 bc23fb787551..1dbcb6377ed3 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.25.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 e89eb222e74f..d0cd713d9077 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.25.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 84db15fc2c0e..dc585124df1c 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.25.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 f6f20d7abff8..0519c3ba63a0 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.25.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/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java index a3fc75dcc4f8..ac5a2fd1272b 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java index 4171f01f6aed..faf1e1ff30ef 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 295a51d10519..145a59fb7768 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.25.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 7f383201e0da..8edad109831f 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.25.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 780016597836..3937b4be3e83 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.25.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 4d7bc9d2cd7e..14c946e79f89 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.25.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 57935b018396..8446d9313251 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.25.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 c3a8d46a2eba..613b36dd183c 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.25.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 1ba709922615..58cef91c05f9 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.25.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 3cf52be09aff..32f8cefee8e0 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.25.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 12d8b2dd8680..02b49f9390c0 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.25.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 34cd1d0a8987..4fa06b4dd21b 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.25.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 d59b297318fa..67474f01ec05 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 22b52d28adf0..557c82088717 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.25.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 fb35e1e2bcb2..3b7cdb677828 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.25.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 272e46368765..bf82c3edbd20 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.25.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 78072e14c990..f55a0364cdd8 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.25.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 819aeec7a44c..7206109c7d20 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 1dbd505badcb..f76eec0f4aa4 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.25.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 b67d9c5afaac..b35debc9fe14 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.25.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 2dfd17aa2690..ca80887aed58 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 a289d93db4e9..1931d0ee7cd0 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.25.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 d37dc45bb056..970c6a6d06d1 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.25.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 1ce2cf86a595..b021a9d4e456 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.25.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/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 47650e48a8d1..fe0be24e229d 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,8 +30,10 @@ public class ContainerDefaultValueDto { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1de67f7c0d3f..f55f17cc56c7 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.25.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 b7c106960439..e214b9a22a55 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 4f4d9b5821bb..5069a1a9acbb 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; /** @@ -100,6 +102,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -137,6 +140,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -174,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/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java index 353093dd0728..a451866b8b42 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.25.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 bf0ddb1209d2..b314f4c2fa55 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.25.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 a6302f7c15c0..c68a2728bcb1 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 9c9a31829b61..cab79bbdd7de 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.25.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 6098f5f5c7e7..a1ca411799d9 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.25.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 eb27dd2f2854..e6325f452fa3 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.25.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 e399a462a232..c8789eabac80 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.25.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 3013c106da9c..5e0afafe3770 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.25.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 6f3aeed1db4f..b6b48d488ede 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; @@ -22,12 +23,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 0390e8d4d1ff..41ad288217eb 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.25.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 20c1058e1c1e..77d035a18c6f 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.25.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 dbb746cdd42d..054320f31690 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.25.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 0e20fd2c2156..af08c71fb48f 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 4e1818acd0ba..791eea25f843 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List tags = new ArrayList<>(); /** @@ -78,6 +84,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 49fc8522cb61..f0364f51c6e0 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.25.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 1d58f2e9ee4a..b33e49d5fdca 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.25.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 97b51b0d19be..e13804a7a1a7 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.25.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 c012011c1225..f51104c163d7 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.25.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 36f6c923d9f7..81ed0e519fbf 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.25.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/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 987983e43451..8ca218f8c704 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 4db40f3db382..eea548352cc7 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 7fc03feb74bb..146f36a6e6a7 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.25.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 8003bf2ed10f..e6e5ee477df6 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.25.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 32fa83771633..785088a60070 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.25.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 6c5858f8d968..97f67087df1b 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.25.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 b707d0febbd0..c0d85125abc2 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.25.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 408d4b29d750..590fef4efc14 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -74,6 +80,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 8ed3a6fe6453..3d3b2de5b80a 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.25.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 e255ce433c6d..c24c06fe7563 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 039b852ec2ad..4928b88af0da 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String name; public Category id(Long id) { 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 559c232f90a7..55b4059d5d90 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String type; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String message; public ModelApiResponse code(Integer code) { 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 4b65be0912e7..717aa283298e 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,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime shipDate; @@ -69,8 +80,12 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Boolean complete = false; public Order id(Long id) { 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 e14fd7d391ed..f1c2b29bb129 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,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -73,6 +84,8 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @Deprecated private 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 14dd1e106aab..cf54ccead568 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String name; public Tag id(Long id) { 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 dd50584c870e..b98a0b4dd692 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,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String username; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String email; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Integer userStatus; public User id(Long id) { 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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 bf8f8eb792e3..83c89d9c9800 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; @@ -28,22 +29,30 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 b3d2b8e934ca..68aca95b6987 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 410297196310..56776316e18b 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 02d4683c376d..a5a825b810a7 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 b09bb3225d1e..e38835f08058 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.25.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 c8e4a12db550..6f460b1efe0f 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.25.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 a92b5ee15ce7..cf8d702378be 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 5d3bc987a57f..5e934e643224 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 b8c138a26f3b..3143a254184d 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.25.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 9732b190e976..a27e17824a8e 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 97b4b746044f..65e0ceefa324 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 fe35f16720f1..3f9be180fd12 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 21ce083867e4..ad228020783e 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 cbc80297f977..2905cdf83cf0 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +84,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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index 56da244f404e..8eb2ebe70171 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index 2796a8f8c4ec..7547cfb95047 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 28e0b05c9442..1268109b1c52 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 d50008b0cc77..141ad532407c 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,6 +82,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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java index ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 ffa017475297..9d2869a9bc9f 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.25.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 a6310e32c005..26f65cfc2849 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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java index 3ea2af2720cd..0f2566549e46 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Apple.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Apple implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java index 8b42e4bccec3..d6f893866d1e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Banana.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Banana implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 82cc612e6cae..183cf2f6e604 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; @@ -28,12 +29,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Bar extends Entity implements BarRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 9bf046ea7ad1..1a62a9ca8026 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.25.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 9d13a5fe1c43..68e2156bfe37 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 4d5f5eb27b51..c0c83681e122 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 11730ebb0153..9c8ba78f46c0 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.25.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 9e3c0ce9d02d..6474eab33c57 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.25.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 a0d49d52576b..d3b3476145d6 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,14 +40,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 27520d6ec8e9..fb39bfa8fd71 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,25 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 f7ffa9174955..5426785a0d55 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,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Extensible { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { 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 ebbeffd71d45..d2bc6b716ab6 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.25.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 f5394195b4f1..fcb066d95f00 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.25.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 13282587b94b..9d9fa8b05fa6 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/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java index 3d77543df254..2233230221a9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Fruit.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 97359af0597e..9c1dda282524 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.25.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 f63e05e354a0..4de940447fa0 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.25.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 3590e03ae8a1..e6c2cba0c20f 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.25.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 87870ad8194c..594f2dca0200 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.25.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 77c26035a11c..6e8356747357 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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java index f98df374ed7a..3cb15460b8cf 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Apple.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Apple implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java index b168fc3d764e..1796fc81d4be 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Banana.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Banana implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 a7a77e4720f9..0a385721560a 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; @@ -28,12 +29,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Bar extends Entity implements BarRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 3fe89b2ba217..55d900764ed0 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.25.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 59e3888f7321..1ca4f8aaf942 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 f71cc1b0c773..3f5d373fb32e 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 e97dcc568a98..e8f6cb51f0ad 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.25.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 e7b618599f61..8cf05ff1b671 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.25.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 91cb88124f95..10167c1164ee 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,14 +40,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 a07b574e2795..6d9b7196a1ee 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,25 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 7a7df0d04f85..bf5afd3ab33b 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,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public final class Extensible { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { 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 599e1966eecd..233176c25d53 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.25.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 5ae73148544e..b247fe7b63c8 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.25.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 c3b8c576c36c..60a7996ef1f9 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/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java index 45b655f0ce22..a9901953bd7e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Fruit.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 84b890415735..24c5f71d93d9 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.25.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 b6bfb901b432..5e900406aeb6 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.25.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 94a2eb13e8af..1da7a3e2ef19 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.25.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 b6545d95e7bf..3a20e98baf7e 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.25.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 6e71d9693004..cfa10e5cb5dd 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/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java index 0be64c62685f..cd02d6d6bdab 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Apple implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer seeds; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Apple() { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java index cb801806025f..cd3bb74e50bd 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,8 +27,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Banana implements Fruit { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer length; + @JsonInclude(JsonInclude.Include.NON_NULL) private FruitType fruitType; public Banana() { 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 ab29c2cfc009..9854268cedbe 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; @@ -28,12 +29,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Bar extends Entity implements BarRefOrValue { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 646cc44b909f..7ffab64ee1eb 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.25.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 a2551c1fa7b2..1e15e29798a3 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 4d5f5eb27b51..c0c83681e122 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 060789d0a512..a91f338c5a09 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.25.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 88a6685f4da8..cdf15b9fbcfe 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.25.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 73b966943a14..0068e39ff4cc 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,14 +40,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Entity() { 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 4baa34e74522..782967688b0e 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,25 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 9cf01b0cefb9..ee4781a36c64 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,10 +23,13 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Extensible { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atSchemaLocation; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable String atBaseType; + @JsonInclude(JsonInclude.Include.NON_NULL) private String atType; public Extensible() { 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 b881a89e5d44..01f6d106b03d 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.25.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 9791b57e02c9..64a005b67d82 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.25.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 13282587b94b..9d9fa8b05fa6 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/Fruit.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java index 3d77543df254..2233230221a9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Fruit.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 c199776fd118..c15d8b461eca 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.25.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 f7bd44198867..ec431100495f 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.25.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 d8a7642b507b..aff82cd909d6 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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/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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 338b861acb7c..763ff76887c5 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.25.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 52205a82e314..911ca84e0fc9 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.25.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 2d647af3e340..b85b8124de6c 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.25.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 5b70efa954c3..0ff80dbce269 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -84,6 +90,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 7e344ee33b83..004732b1789b 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.25.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 1a7f9d53a1de..5760b8504888 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.25.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 338b861acb7c..763ff76887c5 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.25.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 52205a82e314..911ca84e0fc9 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.25.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 9e9765017ab7..0ac7b477d0db 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.25.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 e7a4c5f76ddc..8b46bc621498 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; 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 7e344ee33b83..004732b1789b 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.25.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 1a7f9d53a1de..5760b8504888 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.25.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 d07f15297568..0c2e561bc8a4 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,29 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Foo { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dt; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private org.springframework.core.io.@Nullable Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List listOfDt = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List listMinIntems = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime requiredDt; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal number; public Foo() { 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 d38f527ddc1c..31dda006bb3b 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public Category() { 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 ed9435cd970f..1f3adcabd406 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String message; public ModelApiResponse() { 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 b6a9566eb959..376d86e8d637 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,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -79,8 +90,12 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Boolean complete = false; public Order() { 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 8eaca2ce118c..4f2e1cb02f2f 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,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -83,6 +94,8 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @Deprecated private @Nullable StatusEnum 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 ba92363341b5..fcf543d6cf15 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public Tag() { 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 ef7370bcb0c0..73194fbf692a 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,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer userStatus; public User() { 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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +84,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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +84,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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 e91d631ed6ce..285c75498b76 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.25.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 65256fec62d7..012830fb51ee 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.25.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 8b2aae4f47c8..e99b12320ab2 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.25.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 8204ac088fd2..47e43e89eb8a 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -74,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-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 752af7300bd6..238c2d398b64 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.25.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 90b75375b23f..0f05a96beab1 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.25.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/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index 3c578280b0cd..e3002073fbe6 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; @@ -33,8 +34,10 @@ public class Pet { private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); private List<@Valid Tag> tags = new ArrayList<>(); diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt index d5af2e05d658..4887b45e853b 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/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.JsonValue import com.fasterxml.jackson.annotation.JsonIgnoreProperties @@ -24,6 +25,7 @@ import jakarta.validation.Valid */ data class Cat( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("huntingSkill") @get:JsonProperty("huntingSkill", required = true) val huntingSkill: Cat.HuntingSkill, diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt index de31e3c6a74b..599607754f1d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/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.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties @@ -25,10 +26,12 @@ import jakarta.validation.Valid data class Dog( @field:Valid + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String = "dog", @get:Min(value=0) + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("packSize") @get:JsonProperty("packSize", required = true) val packSize: kotlin.Int = 0 ) : Pet { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt index 40869b85e6bb..373c49ea1ab7 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/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.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo 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 cd4ca70bbd76..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,9 +2,12 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Bird import org.openapitools.model.Robobird import jakarta.validation.constraints.DecimalMax 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 2c04b66ba59f..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,9 +2,12 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Bird import org.openapitools.model.Robobird import jakarta.validation.constraints.DecimalMax 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 e3ca20f62dde..cf8ed4566029 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,7 +1,10 @@ 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 import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo @@ -24,15 +27,21 @@ import jakarta.validation.Valid */ data class Bird( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "BIRD", + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_BIRD", + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("propertyA") @get:JsonProperty("propertyA") val propertyA: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("sameNameProperty") @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 fd68cebbbd66..374a42c3886d 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,7 +1,10 @@ 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 import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo @@ -24,15 +27,21 @@ import jakarta.validation.Valid */ data class Robobird( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "ROBOBIRD", + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_ROBOBIRD", + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("propertyB") @get:JsonProperty("propertyB") val propertyB: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("sameNameProperty") @get:JsonProperty("sameNameProperty") val sameNameProperty: kotlin.String? = null ) : Animal, AnotherAnimal { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt index f4e25930868d..831595203de0 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.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.JsonValue import org.openapitools.model.VehicleType @@ -26,9 +27,11 @@ import jakarta.validation.Valid data class Car( @field:Valid + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.CAR, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("numDoors") @get:JsonProperty("numDoors", required = true) val numDoors: kotlin.Int ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt index 61b3bda8c499..723e2f2376e8 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.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.JsonValue import org.openapitools.model.VehicleType @@ -26,9 +27,11 @@ import jakarta.validation.Valid data class Truck( @field:Valid + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.TRUCK, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("payloadCapacity") @get:JsonProperty("payloadCapacity", required = true) val payloadCapacity: java.math.BigDecimal ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt index 637caa41c0e0..afd7fad1a33d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Vehicle.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.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo 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 d7af8ac2f376..41a79066f461 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,10 +22,14 @@ import javax.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 17f359944597..876981873b0e 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -20,12 +23,18 @@ import javax.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c5aeefef9cb9..c185ea107046 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,21 +28,33 @@ import javax.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 13230cd6a413..d37fcde397d1 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -27,24 +30,34 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 d91b756eb790..cd1a35d618e7 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2bd739c6dde1..12b33d8f20a6 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,27 +28,43 @@ import javax.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 765c68c55802..ec50829c0635 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 de13e1983566..3ebf5f5ea0cd 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e10ff9493c93..76f4f093738b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 6be3f28f3fbb..818ca34ee824 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 480c43759fe2..e833b8073c86 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3dfd48b96c80..d1afe1c0927b 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 765c68c55802..ec50829c0635 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 de13e1983566..3ebf5f5ea0cd 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e10ff9493c93..76f4f093738b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 6be3f28f3fbb..818ca34ee824 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 480c43759fe2..e833b8073c86 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3dfd48b96c80..d1afe1c0927b 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 765c68c55802..ec50829c0635 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 de13e1983566..3ebf5f5ea0cd 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e10ff9493c93..76f4f093738b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 6be3f28f3fbb..818ca34ee824 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 480c43759fe2..e833b8073c86 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3dfd48b96c80..d1afe1c0927b 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 765c68c55802..ec50829c0635 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 de13e1983566..3ebf5f5ea0cd 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e10ff9493c93..76f4f093738b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 6be3f28f3fbb..818ca34ee824 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 480c43759fe2..e833b8073c86 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3dfd48b96c80..d1afe1c0927b 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 765c68c55802..ec50829c0635 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 de13e1983566..3ebf5f5ea0cd 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e10ff9493c93..76f4f093738b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 6be3f28f3fbb..818ca34ee824 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 480c43759fe2..e833b8073c86 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3dfd48b96c80..d1afe1c0927b 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 92cbca7cbe70..c4d95e75225c 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -20,6 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class Annotation( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @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 5ca548188de4..28f9f7e2cf42 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag @@ -38,57 +41,80 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPet( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 50bf2ac745cd..7e5d66de499d 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag @@ -38,57 +41,80 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPetOrArrayString( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 78e69fe3206e..70c208827031 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 1a70cfc46c33..53ef9b788fdb 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 67d32d113728..004b070872ad 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 9e4489fe6fcd..ab6822d9644c 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 7e598a009ae4..3e30bd07719f 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 b31dd0ce4ea5..e16108c6b858 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,7 +1,10 @@ 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 import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue import javax.validation.constraints.DecimalMax @@ -29,34 +32,49 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 c337b9d447ac..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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag 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 e94b3aee8c38..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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Pet import org.openapitools.model.Tag 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 436cdb86a1b3..7aac833c5278 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,10 +22,14 @@ import jakarta.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2c15ecefe8c6..2c5456d58b3f 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +23,18 @@ import jakarta.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 f1f63637f847..79363b092edf 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.PlaceOrderResponse import org.openapitools.model.GetOrderByIdResponse import jakarta.validation.constraints.DecimalMax @@ -27,21 +30,33 @@ import jakarta.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 a632610f7459..4734ca04df3e 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import org.openapitools.model.UpdatePetResponse @@ -30,24 +33,34 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 ecbdc52c730d..87ccccbea017 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +22,13 @@ import jakarta.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 cd5bb62ec68c..94fd92baee7c 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,7 +1,10 @@ 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 import org.openapitools.model.GetUserByNameResponse import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -26,27 +29,43 @@ import jakarta.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 84485a66eb96..f44ed4c7ace6 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,10 +22,14 @@ import jakarta.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 bc1eb76d4b71..8d84914db2ba 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +23,18 @@ import jakarta.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e865644bd4f8..486848e14599 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,21 +28,33 @@ import jakarta.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 472eb39902dc..7cf3de7d9c48 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -27,24 +30,34 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 f60b101132b0..e3ec341838e6 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +22,13 @@ import jakarta.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3fcde2466802..93294737c422 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,27 +28,43 @@ import jakarta.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 84485a66eb96..51d9077df63b 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 @@ -2,6 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSetter +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,10 +21,12 @@ import jakarta.validation.Valid */ data class Category( + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @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.SKIP) @param:JsonProperty("name") @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 bc1eb76d4b71..7689e944371e 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 @@ -2,6 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSetter +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +22,15 @@ import jakarta.validation.Valid */ data class ModelApiResponse( + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e865644bd4f8..c14d1323ba00 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 @@ -3,7 +3,9 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,21 +27,27 @@ import jakarta.validation.Valid */ data class Order( + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 472eb39902dc..35b6f48617a1 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -27,24 +30,30 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 f60b101132b0..38364c2ba7a2 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 @@ -2,6 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSetter +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +21,11 @@ import jakarta.validation.Valid */ data class Tag( + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3fcde2466802..268dc150996d 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 @@ -2,6 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSetter +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,27 +27,35 @@ import jakarta.validation.Valid */ data class User( + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 84485a66eb96..f44ed4c7ace6 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,10 +22,14 @@ import jakarta.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 bc1eb76d4b71..8d84914db2ba 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +23,18 @@ import jakarta.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e865644bd4f8..486848e14599 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,21 +28,33 @@ import jakarta.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 472eb39902dc..7cf3de7d9c48 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -27,24 +30,34 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 f60b101132b0..e3ec341838e6 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +22,13 @@ import jakarta.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3fcde2466802..93294737c422 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,27 +28,43 @@ import jakarta.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 84485a66eb96..f44ed4c7ace6 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,10 +22,14 @@ import jakarta.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 bc1eb76d4b71..8d84914db2ba 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +23,18 @@ import jakarta.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 e865644bd4f8..486848e14599 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,21 +28,33 @@ import jakarta.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 6183fecadda2..f6f096f6eed4 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -27,24 +30,34 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 f60b101132b0..e3ec341838e6 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +22,13 @@ import jakarta.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3fcde2466802..93294737c422 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -25,27 +28,43 @@ import jakarta.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 b076f69d2cfa..9ec6249ca10e 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,18 +28,24 @@ import io.swagger.v3.oas.annotations.media.Schema data class Apa( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bepa") @get:JsonProperty("bepa", required = true) val bepa: java.math.BigDecimal = java.math.BigDecimal("0"), @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("cepa") @get:JsonProperty("cepa", required = true) val cepa: java.math.BigDecimal = java.math.BigDecimal("6.28318"), @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("depa") @get:JsonProperty("depa") val depa: java.math.BigDecimal? = java.math.BigDecimal("71"), @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("epa") @get:JsonProperty("epa") val epa: java.math.BigDecimal? = java.math.BigDecimal("-71"), 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 c8f9e42d630f..a79181c7ee83 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 62aa109e8227..621aaabbe505 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 030560495222..7b43d5674865 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 463ea9d69c48..7cd760e87cc8 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 7233dac2641a..ba99d00fd09d 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 ca75fe59632a..7fbfe9055862 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 78e69fe3206e..70c208827031 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 1a70cfc46c33..53ef9b788fdb 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 67d32d113728..004b070872ad 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 094e09ad0a18..0a072512fd08 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 7e598a009ae4..3e30bd07719f 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 58c5d775bc53..ec11f6cb5068 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 4892c7ebd193..0869716cacdd 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -34,41 +37,56 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("hunts") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("age") @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 41796c00cfe3..af04a591d91a 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 320d49095c5d..9cd0d8edc3f8 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -35,45 +38,59 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) val breed: Dog.Breed, @ApiModelProperty(required = true, value = "Whether the dog enjoys fetching") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 b41cd7d13e4b..1b1776c2ccfc 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c0592ae91b67..0cb6324faa4b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 3256dcc40cce..14b070fef3c8 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,10 +3,13 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonValue +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Tag 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 e5da6730d6b9..5c9781bdd99d 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 1ec1bc9315f5..3e0e6531d605 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 12c051928bf5..eb40a7638b18 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.ReasonCode import org.openapitools.configuration.ValuedEnum import jakarta.validation.constraints.DecimalMax @@ -23,10 +26,13 @@ import jakarta.validation.Valid */ data class ApiError( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("errorCode") @get:JsonProperty("errorCode", required = true) val errorCode: ApiError.ErrorCode, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("reasonCode") @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 c59ad252e2a2..521ef45226d1 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 246eb740d4a9..00e04fb41353 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") var code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") var type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 199ac61b8616..acbf3a877d82 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") var petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") var quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") var shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") var status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 c95694c7697f..687cc12f771f 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,28 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) var name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) var photoUrls: kotlin.collections.MutableList, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") var category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") var tags: kotlin.collections.MutableList? = null, @Schema(description = "pet status in the store") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 38f3ba26b235..858c04d95899 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 732aa16f274c..c9063f163fe6 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") var username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") var firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") var lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") var email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") var password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") var phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_DEFAULT) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 26e9cb7246ee..67a9e9aa4655 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -20,6 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class MultipartMixedRequestMarker( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 338cad3e82e1..8699b8c6b258 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 17f359944597..876981873b0e 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -20,12 +23,18 @@ import javax.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c5aeefef9cb9..c185ea107046 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,21 +28,33 @@ import javax.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 1072289406f0..572741c45089 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -27,23 +30,33 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 d91b756eb790..cd1a35d618e7 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2bd739c6dde1..12b33d8f20a6 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,27 +28,43 @@ import javax.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 338cad3e82e1..8699b8c6b258 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 17f359944597..876981873b0e 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -20,12 +23,18 @@ import javax.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c5aeefef9cb9..c185ea107046 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,21 +28,33 @@ import javax.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 1072289406f0..572741c45089 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -27,23 +30,33 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 d91b756eb790..cd1a35d618e7 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2bd739c6dde1..12b33d8f20a6 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,27 +28,43 @@ import javax.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 00a0c004e41a..466b9dbe86a3 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +22,13 @@ import jakarta.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("amount") @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/PageMeta.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt index d2938312720f..a40d0746abed 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.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 jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -21,15 +22,19 @@ import jakarta.validation.Valid */ data class PageMeta( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("size") @get:JsonProperty("size", required = true) val propertySize: kotlin.Long, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("number") @get:JsonProperty("number", required = true) val number: kotlin.Long, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("totalElements") @get:JsonProperty("totalElements", required = true) val totalElements: kotlin.Long, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("totalPages") @get:JsonProperty("totalPages", required = true) val totalPages: kotlin.Long ) : 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 162d5f8926cd..1fef46231b24 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +23,17 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 f8ded6dea368..808117dbd28f 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,7 +1,10 @@ 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 import org.openapitools.model.PageMeta import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -21,13 +24,19 @@ import jakarta.validation.Valid */ data class SearchResult( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("query") @get:JsonProperty("query") val query: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("totalHits") @get:JsonProperty("totalHits") val totalHits: kotlin.Int? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("page") @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 1870d4ccb214..422da5e76453 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,9 +22,13 @@ import jakarta.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 173e389e2c47..f65571c55f0f 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,7 +1,10 @@ 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 import org.openapitools.model.User import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -21,9 +24,13 @@ import jakarta.validation.Valid data class UserList( @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("content") @get:JsonProperty("content") val content: kotlin.collections.List? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("description") @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 78e69fe3206e..70c208827031 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 1a70cfc46c33..53ef9b788fdb 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 67d32d113728..004b070872ad 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 094e09ad0a18..0a072512fd08 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 7e598a009ae4..3e30bd07719f 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 58c5d775bc53..ec11f6cb5068 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 78e69fe3206e..70c208827031 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,11 +24,15 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 1a70cfc46c33..53ef9b788fdb 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 67d32d113728..004b070872ad 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 094e09ad0a18..0a072512fd08 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,29 +32,39 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") @Deprecated(message = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 7e598a009ae4..3e30bd07719f 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 58c5d775bc53..ec11f6cb5068 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 a0cdb6a3e368..49d3e8d0cdb9 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,9 +2,12 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email 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 55210d36ff60..3ded71b1e461 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,7 +1,10 @@ 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 import org.openapitools.model.Animal import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -23,14 +26,19 @@ import io.swagger.v3.oas.annotations.media.Schema data class Cat( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("declawed") @get:JsonProperty("declawed") val declawed: kotlin.Boolean? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 73ccf5dad3df..48a8f76d11bf 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String = "default-name", @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @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 090f7b1617a3..5e178d382ad3 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,6 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class Client( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("client") @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 515b08c47709..f6565a59f920 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,7 +1,10 @@ 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 import org.openapitools.model.Animal import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -23,14 +26,19 @@ import io.swagger.v3.oas.annotations.media.Schema data class Dog( @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("breed") @get:JsonProperty("breed") val breed: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 0ff3f3834455..b6003fa0b6ef 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,6 +23,8 @@ import io.swagger.v3.oas.annotations.media.Schema data class Foo( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("bar") @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 0dcf505c0339..1b9a66de986b 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,7 +1,10 @@ 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 import org.openapitools.model.Foo import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -22,6 +25,8 @@ data class FooGetDefaultResponse( @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("string") @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 d0443e18e453..85191632cd69 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 bc597e1d9c17..2af160a5a2c6 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 ccfbbce25175..664fcc2f0214 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -29,28 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.Set, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 cfb394d97826..13b8277d89ed 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 c870d154cca1..28822e59853c 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 5a812b1b9303..808f5695c0c8 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,7 +1,10 @@ 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 import org.openapitools.jackson.nullable.JsonNullable import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -22,12 +25,16 @@ import jakarta.validation.Valid */ data class NullableModel( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("requiredNonNullable") @get:JsonProperty("requiredNonNullable", required = true) val requiredNonNullable: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("requiredNullable") @get:JsonProperty("requiredNullable", required = true) val requiredNullable: kotlin.String?, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.FAIL) @param:JsonProperty("optionalNonNullable") @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 f249e7242f2b..3adf7cb3f88b 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,7 +1,10 @@ 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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -20,12 +23,17 @@ import jakarta.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.FAIL) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.FAIL) @param:JsonProperty("status") @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 022cd5ef8d83..2e4b3bc52c76 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 9c26231ac3a8..e14211ff5731 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 5764d2f4bad5..27dffa4141f6 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(value = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 c22448547859..121502d59510 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,28 +32,38 @@ import io.swagger.annotations.ApiModelProperty data class Pet( @ApiModelProperty(example = "doggie", required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @ApiModelProperty(value = "pet status in the store") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 7bd373b57ac9..772d8a878a17 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 3547d749c89f..3adc5fb6dc73 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(value = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 bbace9d4f62d..3a41378a588d 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 e49de97348c8..4b36930f1360 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.v3.oas.annotations.media.Schema data class ModelApiResponse( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 5a0f6ad69955..60cfdb5577f3 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Order( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(description = "Order Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 d4f6dd39c641..298428490fdf 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax @@ -29,28 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(required = true, description = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(description = "pet status in the store") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 60fde5ce5caa..077505d41607 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.v3.oas.annotations.media.Schema data class Tag( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 56e78eddd54b..cb98bda412e2 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(description = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(description = "User Status") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 4892c7ebd193..0869716cacdd 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -34,41 +37,56 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("hunts") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("age") @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 3e6f385de5e7..4935e94e1574 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.annotations.ApiModelProperty data class Category( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 32e22c9d8201..911756347da6 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Pet @@ -35,45 +38,59 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) override val bark: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) override val breed: Dog.Breed, @ApiModelProperty(required = true, value = "Whether the dog enjoys fetching") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(required = true, value = "") + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("color") @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 b41cd7d13e4b..1b1776c2ccfc 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -22,14 +25,20 @@ import io.swagger.annotations.ApiModelProperty data class ModelApiResponse( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 c0592ae91b67..0cb6324faa4b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,26 +30,38 @@ import io.swagger.annotations.ApiModelProperty data class Order( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 d75666491000..21e90ed770f6 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,10 +3,13 @@ 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 import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonValue +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Color import org.openapitools.model.Tag 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 e5da6730d6b9..5c9781bdd99d 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -21,10 +24,14 @@ import io.swagger.annotations.ApiModelProperty data class Tag( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 1ec1bc9315f5..3e0e6531d605 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -27,34 +30,50 @@ import io.swagger.annotations.ApiModelProperty data class User( @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(value = "") + @field:JsonInclude(JsonInclude.Include.NON_NULL) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 338cad3e82e1..d86ba248177e 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Category( + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 17f359944597..748516067b24 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -20,12 +23,18 @@ import javax.validation.Valid */ data class ModelApiResponse( + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @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 79d96bb6cf5d..10df079f91ab 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.configuration.ValuedEnum import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin @@ -26,21 +29,33 @@ import javax.validation.Valid */ data class Order( + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @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 b5d91a727cea..e4dd73bb038b 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,8 +2,11 @@ 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 +import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import org.openapitools.configuration.ValuedEnum @@ -28,23 +31,33 @@ import javax.validation.Valid */ data class Pet( + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @field:JsonInclude(JsonInclude.Include.ALWAYS) @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @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 d91b756eb790..d697b5ebfa6e 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -19,9 +22,13 @@ import javax.validation.Valid */ data class Tag( + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @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 2bd739c6dde1..d7b4d95ef2c8 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,7 +1,10 @@ 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 import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -25,27 +28,43 @@ import javax.validation.Valid */ data class User( + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @field:JsonInclude(JsonInclude.Include.NON_EMPTY) + @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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/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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 4dabb01f1e9c..430f680158d4 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 f72b2d941a04..edd75902ba63 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.25.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 c733dd03d449..090addbbd583 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.25.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 53c42733dbd6..675b856d3e45 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesAnyType name(@Nullable String 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 b30147f63b0c..c4cc93375b6a 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesArray name(@Nullable String 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 dd3f7cab91d1..4fc0a9cc16da 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesBoolean name(@Nullable String 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 59bdcc9cf957..8c8fef587001 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,46 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Object anytype1; private @Nullable Object anytype2 = null; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Object anytype3; public AdditionalPropertiesClass mapString(Map mapString) { 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 0ade40300312..6ac9fdff8fb4 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesInteger name(@Nullable String 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 ea78ecb1025f..76a52001f257 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesNumber name(@Nullable String 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 5822082c6eab..8658dce01653 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesObject name(@Nullable String 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 baf6f8693ae9..943185937e9d 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public AdditionalPropertiesString name(@Nullable String 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 b05dd880f334..d68a905f982a 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; @@ -35,8 +38,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private String color = "red"; public Animal() { 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 35284cc9339b..c501f85aa0a4 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> 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 62c8f63c5762..3f92a31d8455 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List 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 01afa4c76414..7241c0a4be53 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { 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 bb59b9b890e8..06709bc31808 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,8 @@ public static KindEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable KindEnum kind; public BigCat() { 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 0cd596e70254..bb54603e5ccd 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,28 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String smallCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String capitalCamel; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String smallSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String capitalSnake; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String scAETHFlowPoints; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String ATT_NAME; public Capitalization smallCamel(@Nullable String smallCamel) { 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 435e51ac9bd4..5007778d234b 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean declawed; public Cat() { 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 1488325f2367..c70eaa3e66f9 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,8 +24,11 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 82298f702715..201010e97d87 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String otherProperty; public ChildWithNullable otherProperty(@Nullable String 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 95fb0bed41ea..3fb8e61e8b38 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String propertyClass; public ClassModel propertyClass(@Nullable String 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 45d37177d48c..9be6d4099760 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String client; public Client client(@Nullable String client) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 518f33493840..6674c88a2e4f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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,8 +27,10 @@ public class ContainerDefaultValue { private @Nullable List nullableArray; + @JsonInclude(JsonInclude.Include.ALWAYS) private List nullableRequiredArray; + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private @Nullable List nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar")); 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 debbdab31a0f..794aae78d768 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String breed; public Dog() { 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 705927aff068..4f89c8476898 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,8 @@ public static JustSymbolEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable JustSymbolEnum justSymbol; /** @@ -97,6 +102,8 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(@Nullable JustSymbolEnum justSymbol) { 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 6987686a8e4a..bd138a9d4845 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,8 @@ public static EnumStringEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable EnumStringEnum enumString; /** @@ -101,6 +106,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -138,6 +144,8 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable EnumIntegerEnum enumInteger; /** @@ -175,8 +183,12 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable EnumNumberEnum enumNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable OuterEnum outerEnum; public EnumTest() { 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 2b6314390901..fb2777c8d8ad 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String sourceURI; public File sourceURI(@Nullable String 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 675978f8db79..bfeb4444c19e 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable File file; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List<@Valid File> files = new ArrayList<>(); public FileSchemaTestClass file(@Nullable File file) { 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 8219ed196fe3..b84f5c1254d3 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,58 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer integer; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer int32; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long int64; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Float _float; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Double _double; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String string; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal bigDecimal; public FormatTest() { 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 ab739d233b7c..0a7610e2760a 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String foo; public HasOnlyReadOnly bar(@Nullable String bar) { 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 21ccac7b9606..91a4abcb039b 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map> mapMapOfString = new HashMap<>(); /** @@ -61,10 +66,16 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { 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 6929f926ac91..c890177e5c7d 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,17 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable UUID uuid; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime dateTime; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { 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 4e1016868c4f..aa582adbe1de 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String propertyClass; public Model200Response name(@Nullable Integer name) { 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 a57f1791a76b..77b8d44c0593 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer code; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String type; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String message; public ModelApiResponse code(@Nullable Integer code) { 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 21efc31dd24f..387898d916e3 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String _123list; public ModelList _123list(@Nullable String _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 86af11448efe..bcb90c304d6a 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer _return; public ModelReturn _return(@Nullable Integer _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 74e4ec24a902..a6e4993c1ddc 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; @@ -22,12 +25,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer snakeCase; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String property; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer _123number; public Name() { 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 ac1d89258230..52a68b30ab73 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal justNumber; public NumberOnly justNumber(@Nullable BigDecimal 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 9fbb66cd1c2a..1595738597f9 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,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long petId; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer quantity; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime shipDate; @@ -70,8 +81,12 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable StatusEnum status; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private Boolean complete = false; public Order id(@Nullable Long id) { 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 d56233734f36..1fc9d46645e8 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,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal myNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String myString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean myBoolean; public OuterComposite myNumber(@Nullable BigDecimal myNumber) { 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 94c9f23d249e..032a06cb2a2b 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,8 @@ public static TypeEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable TypeEnum type; private @Nullable String nullableProperty = null; 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 e3e957e0effb..7bdf76f63b75 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,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -77,6 +88,8 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) @Deprecated private @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 d69a888693ac..6047f75ef858 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String bar; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String baz; public ReadOnlyFirst bar(@Nullable String bar) { 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 8922abd2aea9..f9d4a07cb8c8 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,20 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String normalPropertyName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String UPPER_CASE_PROPERTY_SNAKE; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String lowerCasePropertyDashes; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String propertyNameWithSpaces; public ResponseObjectWithDifferentFieldNames normalPropertyName(@Nullable String normalPropertyName) { 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 174c617927ec..6d8439318c14 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,8 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long $specialPropertyName; public SpecialModelName $specialPropertyName(@Nullable Long $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 f27f68c69d32..7039951b34b3 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,12 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String name; public Tag id(@Nullable Long id) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java index e1ddc677876c..df8b8fbcdb51 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +26,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java index 088b142a7513..3b3204e03b16 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +26,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 31908646688a..eb2111764012 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,36 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String username; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String firstName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String lastName; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String email; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String password; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String phone; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer userStatus; public User id(@Nullable Long id) { 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 114c00720981..e76b8fdf4d6b 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,120 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String attributeString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal attributeNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer attributeInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean attributeBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String nameString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal nameNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer nameInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean nameBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String prefixString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal prefixNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer prefixInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean prefixBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String namespaceString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal namespaceNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer namespaceInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean namespaceBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable String prefixNsString; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable BigDecimal prefixNsNumber; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Integer prefixNsInteger; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private @Nullable Boolean prefixNsBoolean; + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonSetter(nulls = Nulls.SKIP) private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(@Nullable String attributeString) { 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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 e69cda4b505d..f70cd7ba4544 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.25.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 305e330826ea..68f1bee1399f 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.25.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 0c998a8fe88d..2e8ace6a4ea5 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.25.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 becdc509d0e2..32023ee3da1e 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.25.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 2978ded66b53..0fc62e3905c4 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.25.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 3c636a9b5b24..a3d50f5ea99d 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.25.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 1806e7e18411..5372afa1d00f 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.25.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 c827f300da9e..3235d3ca081e 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.25.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 bdf22b885a7e..6ce4f7f8914c 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 76764757072b..9a92cd526ace 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.25.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 9ecd5b726492..baadabd27a2c 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.25.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 be537f314137..c86262a3c62d 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.25.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 2076c5089dd4..44d4a8a4fa4f 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 e5e849af207f..2049d25df082 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.25.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 dae0d9bff2d9..b74f7b14df59 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.25.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 eacf21af2e6d..11e1022ae3d3 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 1ba638034de3..dfdd6ceef579 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.25.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 6e2bea391339..26961ecad89c 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.25.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 6629d2c2e7d1..fa81688184da 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 247e1d07b4e6..b6557ceff4e9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 eaa193e3efe4..10f181253377 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.25.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 58a35c55aeed..53fcc7cf9a6c 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 4e93b751ebd5..8d3ed031d65d 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 fe07d9dbb166..3587f3d71e7d 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.25.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 ec7af4bfcf01..12b3a130c8b3 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.25.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 3aed66682b7c..150781082c6d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 624b93da7528..5abbd8044e38 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.25.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 e9f2cbba5791..6434a14935bd 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.25.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 fc399f544a4e..45cd6f3e51ed 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.25.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 f6f23a56bc4f..6085143f72b3 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.25.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 f97043d5bb61..e6eb0fbe0dc7 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.25.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 b5f16d1ab7d6..bf0855ee7cf5 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.25.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 69da0d0ec785..e514481f175e 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.25.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 fef7f2e1161d..76e74fd67579 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 f47532a34b25..7bee2fb216f4 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.25.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 c9bb0315af3a..4bd1f09f3ab6 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.25.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 a0eb32a2f862..4360cb09bb06 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.25.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 5c066166a7bf..50c34a0c9121 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 cac0e75f030e..ea586df2067a 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 3bdb1720e106..1c53b3f9b96d 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.25.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 59a1cf9cd6ba..bc0ae8290bf0 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.25.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 5cb71635aa7e..e6d15f4a02e0 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.25.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 6268f1153a2a..680dacf1052d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java index 157504edc6d6..d3800560158c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java index 405f1100a495..03b53c193ee8 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 f0f90f941a28..c26d34985b3d 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.25.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 57ad8461f0b1..12df74fa21fe 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.25.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 d4d796a00710..5ca19685bbf4 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.25.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 b2617aee8d53..af49f617a9a1 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.25.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 5988d5d726ed..29052f935f30 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.25.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 c515f6be0bfd..bdce7e27156f 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -74,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-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 03f3c47200d6..c8e8cebe1012 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.25.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 a6a2c5e9cd25..8ac4e02baa05 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.25.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 f19f4997dd03..9797eef1dc59 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.25.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 61be877a344b..f3bfb780fefe 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.25.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 35b4c4432daa..1df2ad972d5f 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.25.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 836c04595185..3f6cf5af234f 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.25.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 df00ee7de792..1a3694366964 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.25.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 77f71d783370..bea92ee62da3 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.25.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 0b2ac766798c..af90c33109e5 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.25.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 3e7074afe6e4..d1b5173f07ad 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.25.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 afb4c39df7d2..dac8f14035fc 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 98f9a7312d56..470b76a19ef8 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.25.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 83b4b5a53030..84a91551dcec 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.25.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 fe517ac77848..b6571aa9814f 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.25.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 4b5df52572c4..82015028dc07 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 f0ca4951861e..a9906eb94fac 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.25.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 983acc0affe8..9b23c6f442fe 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.25.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 ecb49fb56913..d15dbbf7d60c 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 657334adfdca..48f853d1aed5 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.25.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 646237355fbf..a37e0bd1f899 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.25.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 729c3841a349..bfde98877cce 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 92673cbc1dcd..1e996c854efe 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 be48b30c3af8..67dc2cc354fc 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.25.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 b43f8ba34c73..34e24214d1a3 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 f0692ccd8d88..795d53cd01a6 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 d1896abb8825..d0d0714cd6bc 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.25.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 ab054e15dfa6..ec05ace89cde 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.25.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 2c0c89b27fcf..79dc8a7432ae 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 89035e734328..7f1d0d04b32a 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.25.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 756271ad591c..1f755e8a4354 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.25.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 d415ce24c88e..49c3684beb9e 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.25.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 6bb791bbd3b0..2d3c7448725d 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.25.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 f99567868712..fd4666eabb15 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.25.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 aee5e187fe1f..c50eb6e43a2d 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.25.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 353a8fd2b585..4c1e2c3b4afa 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.25.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 802116b61122..4fd62bd3f389 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 3338eb6fc222..a676f604dce1 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.25.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 b18b1ac67105..26e5407d048a 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.25.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 381de7e72949..6497f3716ea5 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.25.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 15183303f48a..af16949486cc 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 e29ec11ac445..1b1399efc065 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java index f40933c6379a..8d6151ba031e 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.25.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 1288e7a312f8..ca39a83ad505 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.25.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 0e58199e5f58..d89a1eece5ff 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.25.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 2bce0cd548c9..64b558b48dae 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java index 7cc05e11b994..57fabf941047 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java index a2f08996fefa..ab33d9a13ef8 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 8ca5ff87a882..482c18e703ff 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.25.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 5e1af6bd1d24..fe7cacc55db1 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.25.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 b4fdd439ab82..7233eb491283 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.25.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 0d6759f52c08..bcb196706fd1 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.25.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 df0d36296a3f..3c11c181f683 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.25.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 5250bfd61674..9ea7f74985a9 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.25.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 ef62dfcc6047..9ae2e694aa73 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.25.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 71009f22ac73..eb389123f7a6 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.25.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 f32b44a5d4fd..11db461d8dab 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.25.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 a217467c9043..0289d23ad8ac 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.25.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 0e141172d442..fe05be4b1c68 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; @@ -37,8 +38,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 e95bcfc0e3dd..208206c16add 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.25.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 28d05932a5c4..21a3327942b8 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.25.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 eee8b3069e75..3c2e76e5a48f 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.25.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 c91039b41823..6ca9048f3a9d 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.25.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 f55ab2684070..07ba266e9706 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 e043a6dd43d3..1fada1ad1cf8 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.25.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 83a644719ecb..b354cf260e1b 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.25.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 73a4eeaa54be..e62f4eb17757 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,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 e3dd2e8bf21b..5e3b97d4ce21 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.25.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 f82c63511a80..903b9628b82f 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.25.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 b2872a88b9e4..aebd2c3534aa 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.25.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/ContainerDefaultValueDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 1e4c9963dd3a..2bc02f7a7cc3 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,8 +32,10 @@ public class ContainerDefaultValueDto { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 8b5866550d36..daa288bc00a5 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.25.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 a0d45bac55c1..91c142030f49 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 3c45014c6f1c..4d3330046620 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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-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 bfdd0fe44938..635d2e3f04ed 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.25.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 7be25fece7b0..d9db95ad76ae 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.25.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 c00fa9a20f4c..e4f7ebda46b3 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 b8fc28ea97b2..5d1d2fe1a4e5 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.25.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 833fcf244514..f0481922777e 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.25.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 0fb6509f3399..f3124a4a864a 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.25.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 6b93de9051e6..4c095937428f 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.25.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 094904e1690e..51494cfbf2ac 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.25.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 97cb1f51c0d3..6055fd7ceb2d 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; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 a5f228700675..34f45a303117 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.25.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 c26506b0f8df..12b2ceabc020 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.25.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 5605ffe5e24d..b80c315a4f26 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.25.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 9ca238397683..982f8d038258 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 d79a35cecdc7..84bb38e9fc00 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -80,6 +86,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 9176e04d2497..671922834946 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.25.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 a5d4eb95316c..23b7b61efb3e 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.25.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 e0a3e0ff49e6..d7892e6f811b 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.25.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 3006f2f6be4a..9add6a684250 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.25.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 af76e7513f2b..ba75f36ce267 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.25.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/TypeHolderDefaultDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index f59eb21da480..4fba162597a9 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +29,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 4b7506f903ec..fb1d40011dac 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +29,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 a5efe83e3002..26fb9afa0d0e 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.25.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 0426dca8bcf5..1a0a7047ef10 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.25.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 12a27e31b013..327bdbf43f5b 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_EMPTY) 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_EMPTY) 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 6d2cd66855f4..7eba849384a7 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_EMPTY) private @Nullable Integer code; @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("type") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String type; @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("message") + @JsonInclude(JsonInclude.Include.NON_EMPTY) 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 15150db35258..9638d243a3e9 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_EMPTY) private @Nullable Long id; @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("petId") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable Long petId; @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("quantity") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable Integer quantity; @Valid @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("shipDate") + @JsonInclude(JsonInclude.Include.NON_EMPTY) @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_EMPTY) private @Nullable StatusEnum status; @@ -103,6 +109,7 @@ public static StatusEnum fromValue(String value) { @JsonProperty("complete") @lombok.Builder.Default + @JsonInclude(JsonInclude.Include.NON_EMPTY) 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 6841397a4d46..f7fcbc4a1758 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,18 +38,21 @@ public class Pet { @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("id") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable Long id; @Valid @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("category") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable Category category; @NotNull @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED) @JsonProperty("name") + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; @@ -56,6 +60,7 @@ public class Pet { @JsonProperty("photoUrls") @lombok.Builder.Default + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); @@ -63,6 +68,7 @@ public class Pet { @JsonProperty("tags") @lombok.Builder.Default + @JsonInclude(JsonInclude.Include.NON_EMPTY) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -106,6 +112,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_EMPTY) @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 613d27ef51a6..af73a26fa88c 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_EMPTY) private @Nullable Long id; @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("name") + @JsonInclude(JsonInclude.Include.NON_EMPTY) 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 97ccbfb7f7d1..34a4dd74e2fc 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_EMPTY) private @Nullable Long id; @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("username") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String username; @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("firstName") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String firstName; @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("lastName") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String lastName; @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("email") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String email; @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("password") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String password; @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("phone") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private @Nullable String phone; @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("userStatus") + @JsonInclude(JsonInclude.Include.NON_EMPTY) 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 84f88c28c03d..34d737caeb42 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.25.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 bdecbad7137c..aaee5308193e 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.25.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 fae7a68a42dd..42a4ef10967e 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.25.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 883bd0e3f587..1a5e177b89a4 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -81,6 +87,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 97f2d1e61dfe..424e058b1eaf 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.25.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 d81fb473cd7e..431c258e7ee4 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.25.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 04fa39b9598e..0ea5e2a44c42 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/PageMeta.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java index 6c356b8a5b13..a1a34c2041d5 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/PageMeta.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.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,12 +25,16 @@ public class PageMeta implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long size; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long number; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long totalElements; + @JsonInclude(JsonInclude.Include.NON_NULL) private Long totalPages; public PageMeta() { 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 f30b74756ec5..5bbe5fb75ae0 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,13 @@ public class Pet implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 72005f1a9c58..52e6b08b402b 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 3943915901fb..745b54b83599 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 79f582aa6ef4..b8aa8b27af7c 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 b3d2b8e934ca..68aca95b6987 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.25.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 ea0b507c324b..f8e6a50f1cb5 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.25.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 f45d4cfe2d8d..2e07158268fa 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.25.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 3c578280b0cd..c16ac8affc4e 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -76,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-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 ec805dc81eee..17d305647101 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.25.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 5d8ac5c931ae..bac00b6cdd0b 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-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 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 444810641c7a..fc4f770ac1d9 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 2d570d118638..7812e1c12382 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 c4ae473599a9..853db31b217e 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 b09bb3225d1e..e38835f08058 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.25.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 168e018cdd45..14fe6a7c76b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0d0d61ec2f17..7bcdb4d68032 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.25.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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index fe9ab6c64302..a51bd99c90fc 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 b729e52bbe02..0cb8e0d45c2d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 64c2548edd1e..d394b3e38431 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 39e68716e21e..728f7cad250d 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 9c78fa190e27..381f8e572739 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.25.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 550c2ba9458e..fb78d1130272 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.25.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 d55ae048db8d..6454c4e43354 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java index 81f9284d385e..79d663d04658 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 bca6f41ef594..e6fa1ccea8b4 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; @@ -27,10 +28,13 @@ public class NullableModel implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private String requiredNonNullable; + @JsonInclude(JsonInclude.Include.ALWAYS) 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 5b090d83cb2c..5ec773c75180 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,13 @@ public class Pet implements Serializable { private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 47b8e42b677f..be90a2e1cd14 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 999fe2e6ea13..bceaaab0ee8e 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 b09bb3225d1e..e38835f08058 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.25.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 6a2a34ae3729..d0a39c8854b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 9ac86b8d9bdd..e24c2373ad81 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 3c9235435a53..63a0767c6aba 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +81,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 9c78fa190e27..381f8e572739 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.25.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 c2b20369867b..4746b2e0d1f2 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 47b8e42b677f..be90a2e1cd14 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 999fe2e6ea13..bceaaab0ee8e 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 b09bb3225d1e..e38835f08058 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.25.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 6a2a34ae3729..d0a39c8854b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 9ac86b8d9bdd..e24c2373ad81 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 3c9235435a53..63a0767c6aba 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +81,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 9c78fa190e27..381f8e572739 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.25.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 c2b20369867b..4746b2e0d1f2 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 47b8e42b677f..be90a2e1cd14 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 999fe2e6ea13..bceaaab0ee8e 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 b09bb3225d1e..e38835f08058 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.25.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 6a2a34ae3729..d0a39c8854b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 9ac86b8d9bdd..e24c2373ad81 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 3c9235435a53..63a0767c6aba 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +81,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 9c78fa190e27..381f8e572739 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.25.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 c2b20369867b..4746b2e0d1f2 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 be3ddd23c4b7..40737de5941e 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.25.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 fbb5dd431ec6..e775d2a731b2 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.25.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 d6dcd87bc84d..1a5423b8d91a 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.25.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 47b8e42b677f..be90a2e1cd14 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.25.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 cbcf0e8033ce..88de22a04357 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.25.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 59450117a05a..782fb4c48c92 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.25.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 3367e44d93cc..2db67c604f26 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.25.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 40e800f1a770..f440d61a5a44 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.25.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 999fe2e6ea13..bceaaab0ee8e 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; @@ -35,8 +36,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 45f084cd4b84..d1a197de6068 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.25.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 a9ef229e56e5..091813f62458 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.25.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 572f5fe4d4a3..910f371a7f2b 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.25.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 b09bb3225d1e..e38835f08058 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.25.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 6a2a34ae3729..d0a39c8854b9 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.25.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 5c9c9197c423..03999441f921 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 209a99352bd8..9e0ae5b85a20 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.25.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 f4ef99fb2ee1..e55956e95884 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.25.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 1963601fb469..c4f6623f0f04 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.25.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 9732b190e976..a27e17824a8e 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 1442cd20f1ab..5bd8c11d9722 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 c076c823c404..f724c26f0cd2 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.25.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 c2bfa2a8f998..a4778403f518 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.25.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 9ac86b8d9bdd..e24c2373ad81 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 50621d43527b..4c6ed03f348b 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.25.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 866b9eb73ec8..40f9ff9b39b0 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.25.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 31585883bdd9..fbe00f3600c5 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.25.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 40f321d71fdb..96035ef3a8d2 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.25.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 556e89e288c0..2edba3121890 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.25.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 e874e2849251..661b329fe284 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.25.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 0064473d6f0e..72ad5ad7a6b4 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.25.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 e4ce317e24aa..4b44b936d3e2 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 18afd36f6a8c..42d698c51a26 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.25.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 5fff47ef73c4..e844de2ad303 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.25.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 8ba3abc42956..e9a00ffd01ae 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.25.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 3c9235435a53..63a0767c6aba 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +81,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 9c78fa190e27..381f8e572739 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.25.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 c2b20369867b..4746b2e0d1f2 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.25.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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java index e3ff9a400f74..94004510586d 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java index 8b1470e92bf0..31461adcaef0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 a2805fb0727f..ee41f7d9fc73 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.25.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 612c1ec989b3..c6e52de883f9 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.25.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 e933b7a29e62..819125eeda40 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.25.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 556e89e288c0..2edba3121890 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.25.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 454dc2da7d4d..675a6f152630 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.25.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 3c9235435a53..63a0767c6aba 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private List photoUrls = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -75,6 +81,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 ff4bc84bdb4d..1f1090ad4b2d 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.25.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 a2805fb0727f..ee41f7d9fc73 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.25.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 9eb7b6bf2785..9d063bfe0199 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.25.0-SNAPSHOT") public class AdditionalPropertiesAnyType { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 36a88bbb2956..035b79379b51 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.25.0-SNAPSHOT") public class AdditionalPropertiesArray { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 c4498bf65e89..a43dab3cb168 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.25.0-SNAPSHOT") public class AdditionalPropertiesBoolean { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 ff90492a66a6..fd92126ac8fa 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.25.0-SNAPSHOT") public class AdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map mapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map mapNumber = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map mapInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map mapBoolean = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map> mapArrayInteger = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map> mapArrayAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map> mapMapString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map> mapMapAnytype = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional anytype1 = Optional.empty(); private JsonNullable anytype2 = JsonNullable.undefined(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 415bf2591a2d..a6865a84ca04 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.25.0-SNAPSHOT") public class AdditionalPropertiesInteger { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 616821004f7b..949bb75ed136 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.25.0-SNAPSHOT") public class AdditionalPropertiesNumber { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 bd246129276d..a08612ec602c 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.25.0-SNAPSHOT") public class AdditionalPropertiesObject { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 68fb798e5627..f63dd41ed5d8 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.25.0-SNAPSHOT") public class AdditionalPropertiesString { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 92c2f02e29b5..f98b0648fa63 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) private String className; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 23c98d95ef77..1fb0711e8121 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.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 153b1c52d6f6..2e19cf30c575 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.25.0-SNAPSHOT") public class ArrayOfNumberOnly { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 24852a6a6e21..65f9d72d6131 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.25.0-SNAPSHOT") public class ArrayTest { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List arrayOfString = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List> arrayArrayOfInteger = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 02da5f361fe1..c53ddd890eb2 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_DEFAULT) 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 e4b310de3e7b..c67a38667963 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.25.0-SNAPSHOT") public class Capitalization { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional smallCamel = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional capitalCamel = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional smallSnake = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional capitalSnake = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional scAETHFlowPoints = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 562d96eb3c27..c07c73c0b95a 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.25.0-SNAPSHOT") public class Cat extends Animal { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 6616a9f99f31..7b78978d0f50 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 0735faccbf7d..61b973fdaf73 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.25.0-SNAPSHOT") public class ChildWithNullable extends ParentWithNullable { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 a1592e06e787..a1b8c345964a 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.25.0-SNAPSHOT") public class ClassModel { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 d7e6442815fe..345b1b7d736e 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.25.0-SNAPSHOT") public class Client { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional client = Optional.empty(); public Client client(String client) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b5f4bc541e39..08ffd48ec9d6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 ac65c730ec54..5befb1bd09f8 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.25.0-SNAPSHOT") public class Dog extends Animal { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 b6dff549c74f..538b17c4100b 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_DEFAULT) private Optional justSymbol = Optional.empty(); /** @@ -98,6 +100,7 @@ public static ArrayEnumEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 88f9ff145618..c0cf00d98185 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_DEFAULT) private Optional enumString = Optional.empty(); /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional enumInteger = Optional.empty(); /** @@ -176,8 +180,10 @@ public static EnumNumberEnum fromValue(Double value) { } } + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional enumNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 3320abd9e949..3f537a2ef5ff 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.25.0-SNAPSHOT") public class File { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 14d0d7c96808..486543b0bca3 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.25.0-SNAPSHOT") public class FileSchemaTestClass { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional file = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 5233f017196e..a50f627cf3f3 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FormatTest { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional<@Min(value = 10) @Max(value = 100) Integer> integer = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional<@Min(value = 20) @Max(value = 200) Integer> int32 = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional int64 = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal number; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional<@DecimalMin(value = "54.3") @DecimalMax(value = "987.6") Float> _float = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional<@DecimalMin(value = "67.8") @DecimalMax(value = "123.4") Double> _double = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional<@Pattern(regexp = "[a-zA-Z]") String> string = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional binary = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) private LocalDate date; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Optional dateTime = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional uuid = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String password; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 ea33275e9797..d69640bfccc9 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.25.0-SNAPSHOT") public class HasOnlyReadOnly { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional bar = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 1cafe66b4207..aad8e2fbe1c4 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.25.0-SNAPSHOT") public class MapTest { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map> mapMapOfString = new HashMap<>(); /** @@ -62,10 +64,13 @@ public static InnerEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map mapOfEnumString = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Map directMap = new HashMap<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 e0ac81e415d3..cf88026327fb 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.25.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional uuid = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Optional dateTime = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 aea844d2d147..9ccd2e4a7990 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.25.0-SNAPSHOT") public class Model200Response { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional name = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 cfcc660dd2f1..ca42979461ea 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.25.0-SNAPSHOT") public class ModelApiResponse { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional code = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional type = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 66b9f2eb87dc..ca8d4b09d2f4 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.25.0-SNAPSHOT") public class ModelList { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 ae28abd89d87..f0b7468ecf70 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.25.0-SNAPSHOT") public class ModelReturn { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 a2bf81ac85fa..ada16d1efe31 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer name; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional snakeCase = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional property = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 7cbc6a153afb..04edef05907b 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.25.0-SNAPSHOT") public class NumberOnly { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 7dfa020c6526..290f5e7585dd 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.25.0-SNAPSHOT") public class Order { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional petId = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional quantity = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) @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_DEFAULT) private Optional status = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 a5ce3f7d738a..b9b2fdb21831 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.25.0-SNAPSHOT") public class OuterComposite { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional myNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional myString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 90f2b9b9c7fc..bf1970e3e5ff 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_DEFAULT) 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 ea22df7284e7..71980b951aac 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional category = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,6 +84,7 @@ public static StatusEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_DEFAULT) @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 c59872e8a2e6..26ca43e45f89 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.25.0-SNAPSHOT") public class ReadOnlyFirst { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional bar = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 db6b72a4a9f1..af3a2fa1a4b0 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.25.0-SNAPSHOT") public class ResponseObjectWithDifferentFieldNames { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional normalPropertyName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional UPPER_CASE_PROPERTY_SNAKE = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional lowerCasePropertyDashes = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 966b59c0cfd3..c995f2258724 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.25.0-SNAPSHOT") public class SpecialModelName { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 932840497bb6..865bd81efc50 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.25.0-SNAPSHOT") public class Tag { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional name = Optional.empty(); public Tag id(Long id) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 2a1d1c058908..2bab3abf7d07 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 315db140f253..65193abb520e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 8918842cb810..5cc40be2fc1c 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.25.0-SNAPSHOT") public class User { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional id = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional username = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional firstName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional lastName = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional email = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional password = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional phone = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 6ca1a0f20ed2..4232cb95d7c0 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.25.0-SNAPSHOT") public class XmlItem { + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional attributeString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional attributeNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional attributeInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional attributeBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List wrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional nameString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional nameNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional nameInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional nameBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List nameArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List nameWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List prefixArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List prefixWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional namespaceString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional namespaceNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional namespaceInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional namespaceBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List namespaceArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List namespaceWrappedArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixNsString = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixNsNumber = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixNsInteger = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private Optional prefixNsBoolean = Optional.empty(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private List prefixNsArray = new ArrayList<>(); + @JsonInclude(JsonInclude.Include.NON_DEFAULT) 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 4bf9e18b202e..d801742ef4a6 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.25.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 0f08fd6d73c4..12bce53502bc 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.25.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 0c3439565fbc..4b951e1d740e 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.25.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 7a51e0f985b2..51f8239e6287 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.25.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 aabbdad76b4d..84149d7bd75e 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.25.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 af9e18f88627..7d0cf02fc1a0 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.25.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 3cb32be3b82f..420d47cbb299 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.25.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 ccfbdcca6d5c..58569a29f57d 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.25.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 76149ec0a8ab..9f6a83b4973f 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Animal { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 c2f5f5484751..f63d20f820cf 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.25.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 c1aed68eaab6..10c7cf0aeaa7 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.25.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 7b24a18f7f1b..41557fa75eb2 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.25.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 4e1aac42101c..b34f4eddf43d 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 d7a0e6e55530..f855f73444f8 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.25.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 0c90b21f9811..21cfe41ddec2 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.25.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 f39c218d9f6b..e4a77578766d 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,8 +23,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Category { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public Category() { 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 74069c6e8c9c..a0f612496cf4 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.25.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 d87332b7d45d..71b09eb7e58a 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.25.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 5605d2466500..6159e67e4a52 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.25.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/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index 223beb5ce1d9..2bd4f51c4140 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -2,6 +2,7 @@ import java.net.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; @@ -29,8 +30,10 @@ public class ContainerDefaultValue { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 09e3123bbf5c..3fc05d2b0bef 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.25.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 a1dddb498f4e..7e4aaa5e1281 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 68c999e43cec..65374acc591d 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; /** @@ -102,6 +104,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -139,6 +142,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -176,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() { 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 7c6a9f980d0d..d797613a3327 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.25.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 88fee05bfb45..87e387835e05 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.25.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 ac3834417a8f..92a22136e7a7 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 ee8df830e2a6..e7388bc45390 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.25.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 d6db3a46d00b..31574261e044 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.25.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 191216309ac7..34650661543e 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.25.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 d2ec93e76bf9..fc4a463a37f9 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.25.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 e5ce35e1e516..a0ce745397b7 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.25.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 1414c325bff8..4f6d20ee15b5 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.25.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 eb69a04b7803..418d998d7250 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.25.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 77492b4bb9ea..736006c8b6f5 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; @@ -23,12 +24,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Name { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 b5076e4b8ffe..d5a3aecb4b23 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.25.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 74ade765fd5b..179156958d22 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.25.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 4d6f0c723a42..d6fa72f10fbb 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.25.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 00c66617713b..bb28729decdd 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 2278502e2c75..6c54f41ddd69 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Pet { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Category category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -78,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-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 ff046e811b8f..61ca8fd712fd 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.25.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 23cb4b9d9a67..3e032a86b2bf 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.25.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 20258da6a869..bf2bf7743d3a 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.25.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 eb664162077c..dc8d4a1403f1 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.25.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/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java index b4242f545bc2..b6e5a480c71e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java @@ -2,6 +2,7 @@ import java.net.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,14 +27,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefault { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefault() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java index c6167ecb0cd8..cba300e3a67e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java @@ -2,6 +2,7 @@ import java.net.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,16 +27,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExample { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExample() { 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 8f4321a72475..ee186f9d2b32 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.25.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 a93d5532c6c8..3088bb19b032 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.25.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 160ad371da85..8e3d16dcc8c3 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.25.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 bcd3636ad682..561cecd69ccf 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.25.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 9926b903ab12..db9084f361ed 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; @@ -36,8 +37,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto implements com.custompackage.InterfaceToKeep, com.custompackage.WithColor { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 e95bcfc0e3dd..208206c16add 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.25.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 28d05932a5c4..21a3327942b8 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.25.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 eee8b3069e75..3c2e76e5a48f 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.25.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 f51e70b77971..e38f789a0f6f 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.25.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 e043a6dd43d3..1fada1ad1cf8 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.25.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 8e98846895a3..ce9c5939132b 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.25.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 73a4eeaa54be..e62f4eb17757 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,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 e3dd2e8bf21b..5e3b97d4ce21 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.25.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 f82c63511a80..903b9628b82f 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.25.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 b2872a88b9e4..aebd2c3534aa 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.25.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 82526a7f8aba..d56cfed97fb6 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.25.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 9c2b6138bca9..67726db20b99 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.25.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 a0d45bac55c1..91c142030f49 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 dbe4f3461f3c..1576c5046e33 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; /** @@ -108,6 +110,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -145,6 +148,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -182,14 +186,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 64cb9fd7c21e..51c97df4966d 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.25.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 bfdd0fe44938..635d2e3f04ed 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.25.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 7be25fece7b0..d9db95ad76ae 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.25.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 b0e91ec947f4..0909f62113bd 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.25.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 2c0b9f25fb1e..9280b90d46fd 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.25.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 b7c5b5f4d9e8..b2bcf9fec2d6 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,54 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 b8fc28ea97b2..5d1d2fe1a4e5 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.25.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 833fcf244514..f0481922777e 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.25.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 0fb6509f3399..f3124a4a864a 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.25.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 6b93de9051e6..4c095937428f 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.25.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 094904e1690e..51494cfbf2ac 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.25.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 97cb1f51c0d3..6055fd7ceb2d 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; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 fffb8ab05d41..55fe5702be7f 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 a5f228700675..34f45a303117 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.25.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 cff7a8d070ea..20fcb7e81930 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.25.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 c26506b0f8df..12b2ceabc020 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.25.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 5605ffe5e24d..b80c315a4f26 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.25.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/OuterObjectWithEnumPropertyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java index 2bc2073abb6a..ab45923a4570 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/OuterObjectWithEnumPropertyDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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.25.0-SNAPSHOT") public class OuterObjectWithEnumPropertyDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private OuterEnumIntegerDto value; public OuterObjectWithEnumPropertyDto() { 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 9ca238397683..982f8d038258 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 d580c291b9fb..5cbf751e6bd4 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -80,6 +86,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 9176e04d2497..671922834946 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.25.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 e0a3e0ff49e6..d7892e6f811b 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.25.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 3006f2f6be4a..9add6a684250 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.25.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 af76e7513f2b..ba75f36ce267 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.25.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 26668f952b73..1d49001b23e6 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.25.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 a5efe83e3002..26fb9afa0d0e 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.25.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 941d81171fd3..2da0ab2da0ba 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.25.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 484b61d0172d..d085828a1a98 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.25.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 064f04de7de9..5626f5e509b5 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.25.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 fdcae05b0129..3115be7ad0b3 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.25.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 ce6bca41aa2e..6313ddf74bf4 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.25.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 ce38b72a2d66..d50ec95a91d1 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.25.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 0d09c1a26855..bf3707a9e829 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.25.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 9a523fc72b17..60dfea1f6b82 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.25.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 92d5bb0a3978..0ea4d126864a 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; @@ -37,8 +38,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AnimalDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 ba9b6fad632b..f6f8bea0af90 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.25.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 83a22ea05739..65c2c9b6a8f1 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.25.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 5a9ecdae4444..84c663d18a50 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.25.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 4f3fd912fc43..b6187f29559e 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.25.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 45409ad5edde..3069dd95042a 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 f0b76760ae22..9aca92a43ae7 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.25.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 e998c3402dd5..829a3912e622 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.25.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 241e2ad4a11d..34487fc4bbc4 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,8 +25,10 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class CategoryDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name = "default-name"; public CategoryDto() { 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 c72b49b8d0f0..1bbcbf6120cf 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.25.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 8958b3112b79..a6981adc1f58 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.25.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 e963ad54ec92..7cd47ad86cc5 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.25.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/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 53ac711f261a..39f4e40b9ba0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,8 +32,10 @@ public class ContainerDefaultValueDto { private JsonNullable> nullableArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.ALWAYS) private JsonNullable> nullableRequiredArray = JsonNullable.>undefined(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List requiredArray = new ArrayList<>(); private JsonNullable> nullableArrayWithDefault = JsonNullable.>undefined(); 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 4554e660bec5..4d8f537e4861 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.25.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 fd1a8e732041..60ac280ce195 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 0ec2f2ef45c6..bf188bb1b01d 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; /** @@ -103,6 +105,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private EnumStringRequiredEnum enumStringRequired; /** @@ -140,6 +143,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } } + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable EnumIntegerEnum enumInteger; /** @@ -177,8 +181,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 dac997f9b4d2..b288d836c24d 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.25.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 db7888f3eb11..c7ff6805ae2a 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.25.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 2c2065bec12a..4f54909c543d 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,48 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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; + @JsonInclude(JsonInclude.Include.NON_NULL) private byte[] _byte; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable org.springframework.core.io.Resource binary; + @JsonInclude(JsonInclude.Include.NON_NULL) @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; + @JsonInclude(JsonInclude.Include.NON_NULL) 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 a9761ec2ba90..7c801fb4a5f3 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.25.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 0cb63bba1953..5d892cbc2679 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.25.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 6faa81b5457f..85f1e6fe7dbe 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.25.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 5c29a37e0300..ebd4a33b6a3f 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.25.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 abc198bac93e..23d324fae4d9 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.25.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 12e83eee1d65..a4fdb5f297fd 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; @@ -25,12 +26,16 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class NameDto { + @JsonInclude(JsonInclude.Include.NON_NULL) 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 7aeda2a39e1c..8ca1f0ca792f 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.25.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 2b65285f2d0c..b98d7d3e3b7d 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.25.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 481f8b7c1258..5b1b21406275 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.25.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 9fc027c726a3..af2b3803d750 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 45c5b2a8956b..bbeb1cf7c867 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,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class PetDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable Long id; + @JsonInclude(JsonInclude.Include.NON_NULL) private @Nullable CategoryDto category; + @JsonInclude(JsonInclude.Include.NON_NULL) private String name; + @JsonInclude(JsonInclude.Include.NON_NULL) private Set photoUrls = new LinkedHashSet<>(); + @JsonInclude(JsonInclude.Include.NON_NULL) private List<@Valid TagDto> tags = new ArrayList<>(); /** @@ -81,6 +87,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 98f3d28105a8..6edfa379dfe9 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.25.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 212e359b803f..051039d81bb5 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.25.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 7e25bf4e27ca..5b018e45708b 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.25.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 0b8c1aa4019f..cf7af97ae837 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.25.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 114b54b4bf15..8f3499f56a83 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.25.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/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index d9d8b4f78585..0ef0624afb20 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,14 +29,19 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderDefaultDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem = "what"; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem = new BigDecimal("1.234"); + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem = -2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem = true; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3)); public TypeHolderDefaultDto() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index aa7879602dc5..fbf86a0db3f3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -2,6 +2,7 @@ import java.net.URI; import java.util.Objects; +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,16 +29,22 @@ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class TypeHolderExampleDto { + @JsonInclude(JsonInclude.Include.NON_NULL) private String stringItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal numberItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Float floatItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Integer integerItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean boolItem; + @JsonInclude(JsonInclude.Include.NON_NULL) private List arrayItem = new ArrayList<>(); public TypeHolderExampleDto() { 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 fe29ed968848..ecc4e0fd74f4 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.25.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 3e5f9452383a..1ed4b1154553 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.25.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) { From 3da24e0545c9b8d8470d285b6ba2aa39f5689417 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Thu, 30 Jul 2026 07:47:18 +0200 Subject: [PATCH 17/20] add whitespace to trigger cicd --- .../java/org/openapitools/codegen/utils/TriStateBoolean.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java index c8a07567c0dd..334dbbc663cb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java @@ -42,3 +42,4 @@ public static TriStateBoolean fromNullableBoolean(Boolean value) { return value ? TRUE : FALSE; } } + From c97aa925cfb8d0654fccb5e32f3f0fddc6c74253 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Thu, 30 Jul 2026 07:47:26 +0200 Subject: [PATCH 18/20] Revert "add whitespace to trigger cicd" This reverts commit 3da24e0545c9b8d8470d285b6ba2aa39f5689417. --- .../java/org/openapitools/codegen/utils/TriStateBoolean.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java index 334dbbc663cb..c8a07567c0dd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/TriStateBoolean.java @@ -42,4 +42,3 @@ public static TriStateBoolean fromNullableBoolean(Boolean value) { return value ? TRUE : FALSE; } } - From 06240079a4ca146850fc764d1f8d85e877cc3643 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Thu, 30 Jul 2026 08:54:21 +0200 Subject: [PATCH 19/20] feat(json-include): refactor JSON annotation handling with JsonAnnotationPolicyUtils --- .../languages/KotlinSpringServerCodegen.java | 116 +++----- .../codegen/languages/SpringCodegen.java | 72 ++--- .../utils/JsonAnnotationPolicyUtils.java | 247 ++++++++++++++++++ .../codegen/utils/JsonIncludePolicyUtils.java | 97 ------- 4 files changed, 296 insertions(+), 236 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonAnnotationPolicyUtils.java delete mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java 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 925dce43afee..29b954979bd0 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 @@ -34,8 +34,8 @@ import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; +import org.openapitools.codegen.utils.JsonAnnotationPolicyUtils; import org.openapitools.codegen.utils.JsonIncludePolicy; -import org.openapitools.codegen.utils.JsonIncludePolicyUtils; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.TriStateBoolean; import org.openapitools.codegen.utils.URLPathUtils; @@ -322,7 +322,7 @@ public KotlinSpringServerCodegen() { addSwitch(SUSPEND_FUNCTIONS, "Whether to generate suspend functions for API operations. Useful for Spring MVC with Kotlin coroutines without requiring the full reactive stack.", suspendFunctions); CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, - JsonIncludePolicyUtils.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC); + JsonAnnotationPolicyUtils.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC); for (JsonIncludePolicy policy : JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES) { optionalNonNullPropertyJsonIncludeOpt.addEnum(policy.name(), policy.getDescription()); } @@ -330,7 +330,7 @@ public KotlinSpringServerCodegen() { cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); addSwitch(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, - JsonIncludePolicyUtils.GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC, false); + JsonAnnotationPolicyUtils.GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC, false); addSwitch(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + "When true, emits @JsonSetter (Nulls.FAIL when openApiNullable is true, otherwise Nulls.SKIP) so " @@ -764,29 +764,10 @@ public void processOpts() { this.generateJsonSetterNullsAnnotations = TriStateBoolean.fromNullableBoolean(convertPropertyToBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS)); } writePropertyBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, generateJsonSetterNullsAnnotations.isTrue()); - if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { - this.optionalNonNullPropertyJsonInclude = JsonIncludePolicy.valueOf(JsonIncludePolicyUtils.normalizeJsonIncludePolicy( - additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString(), - CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)); - } + this.optionalNonNullPropertyJsonInclude = JsonAnnotationPolicyUtils.resolveOptionalNonNullPropertyJsonInclude( + additionalProperties, optionalNonNullPropertyJsonInclude); writePropertyBack(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude.name()); - if (generateJsonIncludeAnnotations.isUnset()) { - LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " - + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " - + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " - + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " - + "@JsonInclude, so leaving this unset preserves that behavior.", - CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, - CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); - } - if (generateJsonSetterNullsAnnotations.isUnset()) { - LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " - + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " - + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " - + "@JsonSetter(nulls = ...) on optional non-nullable fields.", - CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, - CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); - } + JsonAnnotationPolicyUtils.warnIfUnset(LOGGER, generateJsonIncludeAnnotations, generateJsonSetterNullsAnnotations); if (additionalProperties.containsKey(BEAN_QUALIFIERS) && library.equals(SPRING_BOOT)) { this.setBeanQualifiers(convertPropertyToBoolean(BEAN_QUALIFIERS)); @@ -1335,19 +1316,11 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert property.example = null; } - // Scenario 3: optional + non-nullable → emit @JsonSetter to handle explicit JSON nulls, only when - // generateJsonSetterNullsAnnotations is explicitly enabled. - // When openApiNullable=true: Nulls.FAIL → reject explicit null (strict PATCH semantics). - // When openApiNullable=false: Nulls.SKIP → silently ignore explicit null (lenient, protects defaults). - if (generateJsonSetterNullsAnnotations.isTrue() && !property.required && !property.isNullable) { - 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"); - } + // Emit @JsonSetter(nulls = ...) for optional, non-nullable properties when enabled; see + // JsonAnnotationPolicyUtils#resolveJsonSetterNullsMode for the full SKIP/FAIL rules. kotlin-spring + // supports both SKIP and FAIL (failModeSupported=true), unlike spring (SKIP-only). + applyJsonSetterNullsMode(model, property, JsonAnnotationPolicyUtils.resolveJsonSetterNullsMode( + generateJsonSetterNullsAnnotations, property.required, property.isNullable, openApiNullable, true)); // Scenario 4: optional + nullable with openApiNullable → use JsonNullable = JsonNullable.undefined() // so callers can distinguish between a missing key and an explicitly provided null. @@ -1378,47 +1351,29 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert } /** - * Resolve the {@code @JsonInclude} policy into the single universal - * {@code x-jackson-json-include-policy} vendor extension the template emits. Precedence: - *
    - *
  1. A value set directly on the property (manual override in the spec) always wins.
    2. - *
  2. Otherwise, when {@code generateJsonIncludeAnnotations=true}, apply the automatic matrix: - *
      - *
    • required (nullable or not) → {@code ALWAYS} (Kotlin type prevents null for non-nullable; - * explicit null is valid for nullable and must be serialized)
      • - *
    • optional & non-nullable → {@code optionalNonNullPropertyJsonInclude} - * (default {@code NON_NULL}, {@code NONE} = omit)
      • - *
    • optional & nullable → none (JsonNullable module already governs inclusion)
      • - *
    - *
    3. - *
+ * Apply the resolved {@code @JsonSetter(nulls = ...)} mode to a property: sets the + * {@code x-has-json-setter-nulls-skip}/{@code -fail} vendor extension and adds the required imports. */ - private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property) { - if (property.vendorExtensions.containsKey(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName())) { - String manualPolicy = JsonIncludePolicyUtils.resolveManualJsonIncludePolicy( - property.vendorExtensions.get(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()), VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); - if (manualPolicy != null) { - property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), manualPolicy); - model.imports.add("JsonInclude"); - } else { - // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. - property.vendorExtensions.remove(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); - } - return; - } - if (!generateJsonIncludeAnnotations.isTrue()) { + private void applyJsonSetterNullsMode(CodegenModel model, CodegenProperty property, JsonAnnotationPolicyUtils.JsonSetterNullsMode mode) { + if (mode == JsonAnnotationPolicyUtils.JsonSetterNullsMode.NONE) { return; } - JsonIncludePolicy policy = null; - if (property.required) { - policy = JsonIncludePolicy.ALWAYS; - } else if (!property.isNullable) { - policy = optionalNonNullPropertyJsonInclude; - } - if (policy != null && policy.isEmitted()) { - property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy.name()); - model.imports.add("JsonInclude"); - } + property.vendorExtensions.put(mode == JsonAnnotationPolicyUtils.JsonSetterNullsMode.FAIL + ? "x-has-json-setter-nulls-fail" : "x-has-json-setter-nulls-skip", true); + model.imports.add("JsonSetter"); + model.imports.add("Nulls"); + } + + /** + * Resolve the {@code @JsonInclude} policy into the single universal + * {@code x-jackson-json-include-policy} vendor extension the template emits. See + * {@link JsonAnnotationPolicyUtils#resolveJsonIncludePolicy} for the full precedence rules; here, required + * properties (nullable or not) always resolve to {@code ALWAYS} since Kotlin's non-nullable types can + * never hold null. + */ + private void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property) { + JsonAnnotationPolicyUtils.resolveJsonIncludePolicy(model, property, generateJsonIncludeAnnotations, + optionalNonNullPropertyJsonInclude, JsonIncludePolicy.ALWAYS, JsonIncludePolicy.ALWAYS); } @Override @@ -1567,13 +1522,8 @@ public ModelsMap postProcessModelsEnum(ModelsMap objs) { for (CodegenProperty var : cm.optionalVars) { // Scenario 3: optional + non-nullable → emit @JsonSetter when generateJsonSetterNullsAnnotations is enabled. // openApiNullable=true: Nulls.FAIL (strict). openApiNullable=false: Nulls.SKIP (lenient). - if (generateJsonSetterNullsAnnotations.isTrue() && !var.required && !var.isNullable) { - if (openApiNullable) { - var.vendorExtensions.put("x-has-json-setter-nulls-fail", true); - } else { - var.vendorExtensions.put("x-has-json-setter-nulls-skip", true); - } - } + applyJsonSetterNullsMode(cm, var, JsonAnnotationPolicyUtils.resolveJsonSetterNullsMode( + generateJsonSetterNullsAnnotations, var.required, var.isNullable, openApiNullable, true)); // Scenario 4: optional + nullable with openApiNullable → use JsonNullable if (openApiNullable && !var.required && var.isNullable) { var.vendorExtensions.put("x-is-jackson-optional-nullable", true); 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 22f844420e01..a449baca3e6d 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 @@ -40,8 +40,8 @@ import org.openapitools.codegen.templating.mustache.SplitStringLambda; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; import org.openapitools.codegen.templating.mustache.TrimWhitespaceLambda; +import org.openapitools.codegen.utils.JsonAnnotationPolicyUtils; import org.openapitools.codegen.utils.JsonIncludePolicy; -import org.openapitools.codegen.utils.JsonIncludePolicyUtils; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ProcessUtils; import org.openapitools.codegen.utils.TriStateBoolean; @@ -292,7 +292,7 @@ public SpringCodegen() { "Whether to generate sealed model interfaces and classes")); CliOption optionalNonNullPropertyJsonIncludeOpt = CliOption.newString(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, - JsonIncludePolicyUtils.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC); + JsonAnnotationPolicyUtils.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC); for (JsonIncludePolicy policy : JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES) { optionalNonNullPropertyJsonIncludeOpt.addEnum(policy.name(), policy.getDescription()); } @@ -300,7 +300,7 @@ public SpringCodegen() { cliOptions.add(optionalNonNullPropertyJsonIncludeOpt); cliOptions.add(CliOption.newBoolean(CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, - JsonIncludePolicyUtils.GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC, false)); + JsonAnnotationPolicyUtils.GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC, false)); cliOptions.add(CliOption.newBoolean(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, "Whether to generate @JsonSetter(nulls = ...) annotations on optional non-nullable model properties. " + "When true, emits @JsonSetter so an explicit null in the payload does not overwrite the field. " @@ -585,30 +585,11 @@ public void processOpts() { value -> this.generateJsonIncludeAnnotations = TriStateBoolean.fromNullableBoolean(value)); convertPropertyToBooleanAndWriteBack(CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, value -> this.generateJsonSetterNullsAnnotations = TriStateBoolean.fromNullableBoolean(value)); - if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { - this.optionalNonNullPropertyJsonInclude = JsonIncludePolicy.valueOf(JsonIncludePolicyUtils.normalizeJsonIncludePolicy( - additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString(), - CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)); - } + this.optionalNonNullPropertyJsonInclude = JsonAnnotationPolicyUtils.resolveOptionalNonNullPropertyJsonInclude( + additionalProperties, optionalNonNullPropertyJsonInclude); additionalProperties.put(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE, optionalNonNullPropertyJsonInclude.name()); if (jackson) { - if (generateJsonIncludeAnnotations.isUnset()) { - LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " - + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " - + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " - + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " - + "@JsonInclude, so leaving this unset preserves that behavior.", - CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, - CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); - } - if (generateJsonSetterNullsAnnotations.isUnset()) { - LOGGER.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " - + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " - + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " - + "@JsonSetter(nulls = ...) on optional non-nullable fields.", - CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, - CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); - } + JsonAnnotationPolicyUtils.warnIfUnset(LOGGER, generateJsonIncludeAnnotations, generateJsonSetterNullsAnnotations); } if (DocumentationProvider.NONE.equals(getDocumentationProvider())) { this.setUseSwaggerUI(false); @@ -1268,42 +1249,21 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert // Optional + non-nullable, when openApiNullable=false: add @JsonSetter(nulls = Nulls.SKIP) on the // setter so an explicit null in the payload does not overwrite the field's default. Only emitted when // generateJsonSetterNullsAnnotations is explicitly enabled; otherwise deserialization defers to the mapper. - if (generateJsonSetterNullsAnnotations.isTrue() && !property.required && !property.isNullable && !openApiNullable) { + // spring never emits Nulls.FAIL (failModeSupported=false), unlike kotlin-spring. + JsonAnnotationPolicyUtils.JsonSetterNullsMode jsonSetterNullsMode = JsonAnnotationPolicyUtils.resolveJsonSetterNullsMode( + generateJsonSetterNullsAnnotations, property.required, property.isNullable, openApiNullable, false); + if (jsonSetterNullsMode == JsonAnnotationPolicyUtils.JsonSetterNullsMode.SKIP) { property.vendorExtensions.put("x-has-json-setter-nulls-skip", true); model.imports.add("JsonSetter"); model.imports.add("Nulls"); } - // Resolve the @JsonInclude policy into the single universal x-jackson-json-include-policy vendor - // extension the template emits. Precedence: - // 1. A value set directly on the property (manual override in the spec) always wins. - // 2. Otherwise, when generateJsonIncludeAnnotations=true, apply the automatic matrix: - // required & non-nullable -> NON_NULL (contract protection; omit rather than emit invalid null) - // required & nullable -> ALWAYS (explicit null is valid and must be serialized) - // optional & non-nullable -> optionalNonNullPropertyJsonInclude (default NON_NULL, NONE = omit) - // optional & nullable -> none (JsonNullable module already governs inclusion) - if (property.vendorExtensions.containsKey(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName())) { - String manualPolicy = JsonIncludePolicyUtils.resolveManualJsonIncludePolicy( - property.vendorExtensions.get(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()), VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); - if (manualPolicy != null) { - property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), manualPolicy); - model.imports.add("JsonInclude"); - } else { - // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. - property.vendorExtensions.remove(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); - } - } else if (generateJsonIncludeAnnotations.isTrue()) { - JsonIncludePolicy policy = null; - if (property.required) { - policy = property.isNullable ? JsonIncludePolicy.ALWAYS : JsonIncludePolicy.NON_NULL; - } else if (!property.isNullable) { - policy = optionalNonNullPropertyJsonInclude; - } - if (policy != null && policy.isEmitted()) { - property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy.name()); - model.imports.add("JsonInclude"); - } - } + // Resolve the @JsonInclude policy into the x-jackson-json-include-policy vendor extension; see + // JsonAnnotationPolicyUtils#resolveJsonIncludePolicy for the full precedence/matrix rules. For spring, + // required properties resolve to NON_NULL when non-nullable (contract protection) and ALWAYS when + // nullable (explicit null is valid and must be serialized). + JsonAnnotationPolicyUtils.resolveJsonIncludePolicy(model, property, generateJsonIncludeAnnotations, + optionalNonNullPropertyJsonInclude, JsonIncludePolicy.NON_NULL, JsonIncludePolicy.ALWAYS); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonAnnotationPolicyUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonAnnotationPolicyUtils.java new file mode 100644 index 000000000000..aae49411c61c --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonAnnotationPolicyUtils.java @@ -0,0 +1,247 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.utils; + +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenModel; +import org.openapitools.codegen.CodegenProperty; +import org.openapitools.codegen.VendorExtension; +import org.slf4j.Logger; + +import java.util.Map; + +/** + * Shared resolution/validation logic for the Jackson {@code @JsonInclude}/{@code @JsonSetter(nulls = ...)} + * config options and the {@code x-jackson-json-include-policy} vendor extension, used by both the + * {@code spring} and {@code kotlin-spring} generators (issue #24401). + */ +public final class JsonAnnotationPolicyUtils { + + /** Shared {@code CliOption} description for {@code optionalNonNullPropertyJsonInclude}. */ + public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC = + "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " + + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " + + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."; + + /** Shared {@code CliOption} description for {@code generateJsonIncludeAnnotations}. */ + public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC = + "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " + + "spec-honest annotations (required-field protection and the optional non-nullable policy from " + + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " + + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " + + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " + + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag."; + + /** Resolved {@code @JsonSetter(nulls = ...)} annotation to emit for a property, if any. */ + public enum JsonSetterNullsMode { + /** No {@code @JsonSetter(nulls = ...)} annotation should be emitted. */ + NONE, + /** Emit {@code @JsonSetter(nulls = Nulls.SKIP)}: silently ignore an explicit JSON null. */ + SKIP, + /** Emit {@code @JsonSetter(nulls = Nulls.FAIL)}: reject an explicit JSON null. */ + FAIL + } + + private JsonAnnotationPolicyUtils() { + } + + /** + * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. + * + * @param rawPolicy the raw vendor extension value set directly on the property in the spec + * @param extensionName the vendor extension key, used in the error message (kept generator-agnostic) + * @return the normalized (upper-case) policy name to emit, or {@code null} when the override means + * "emit no annotation" ({@code NONE}/blank), in which case the caller must drop the extension. + * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. + */ + public static String resolveManualJsonIncludePolicy(Object rawPolicy, String extensionName) { + JsonIncludePolicy parsed; + try { + parsed = JsonIncludePolicy.parse(rawPolicy); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException(extensionName + + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " + + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " + + "no annotation, but was: " + rawPolicy); + } + if (parsed == null || !parsed.isEmitted()) { + return null; + } + return parsed.name(); + } + + /** + * Validate and normalize the {@code optionalNonNullPropertyJsonInclude} config option value. + * + * @param policy the raw config option value (may be {@code null}, in which case the default + * {@code NON_NULL} is returned) + * @param optionName the config option name, used in the error message (kept generator-agnostic) + * @return the normalized (upper-case) policy name: one of {@code NON_NULL}, {@code NON_EMPTY}, + * {@code NON_DEFAULT}, {@code NONE}. + * @throws IllegalArgumentException when the value is not one of the supported policies. + */ + public static String normalizeJsonIncludePolicy(String policy, String optionName) { + if (policy == null) { + return JsonIncludePolicy.NON_NULL.name(); + } + JsonIncludePolicy parsed; + try { + parsed = JsonIncludePolicy.valueOf(policy.trim().toUpperCase(java.util.Locale.ROOT)); + } catch (IllegalArgumentException e) { + parsed = null; + } + if (parsed == null || !parsed.isValidOptionalNonNullPolicy()) { + throw new IllegalArgumentException(optionName + + " must be one of " + JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES + " but was: " + policy); + } + return parsed.name(); + } + + /** + * Read back the {@code optionalNonNullPropertyJsonInclude} config option from {@code additionalProperties}, + * validating/normalizing it via {@link #normalizeJsonIncludePolicy}. Returns {@code current} unchanged when + * the option was not present in {@code additionalProperties} (i.e. the generator's existing/default value is + * kept). Callers are responsible for writing the resolved value back via their own + * {@code writePropertyBack}/{@code additionalProperties.put} convention. + * + * @param additionalProperties the generator's additional properties map + * @param current the generator's current {@code optionalNonNullPropertyJsonInclude} value + * @return the resolved {@link JsonIncludePolicy} to assign to the generator's field + */ + public static JsonIncludePolicy resolveOptionalNonNullPropertyJsonInclude(Map additionalProperties, JsonIncludePolicy current) { + if (!additionalProperties.containsKey(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)) { + return current; + } + return JsonIncludePolicy.valueOf(normalizeJsonIncludePolicy( + additionalProperties.get(CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE).toString(), + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE)); + } + + /** + * Log the shared "option left unset, defaulting to false" warnings for + * {@code generateJsonIncludeAnnotations}/{@code generateJsonSetterNullsAnnotations} on the caller's own + * {@link Logger}. No-op for each option that is not {@link TriStateBoolean#UNSET}. + * + * @param logger the calling generator's own {@code LOGGER} + * @param generateJsonIncludeAnnotations the resolved {@code generateJsonIncludeAnnotations} state + * @param generateJsonSetterNullsAnnotations the resolved {@code generateJsonSetterNullsAnnotations} state + */ + public static void warnIfUnset(Logger logger, TriStateBoolean generateJsonIncludeAnnotations, TriStateBoolean generateJsonSetterNullsAnnotations) { + if (generateJsonIncludeAnnotations.isUnset()) { + logger.warn("'{}' is not set. Defaulting to false: no @JsonInclude annotations are generated and property " + + "inclusion is governed entirely by the global ObjectMapper (7.23.0-equivalent output). " + + "Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit spec-honest " + + "@JsonInclude annotations (see '{}'). Note: before 7.24.0 released output had no field-level " + + "@JsonInclude, so leaving this unset preserves that behavior.", + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS, CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE); + } + if (generateJsonSetterNullsAnnotations.isUnset()) { + logger.warn("'{}' is not set. Defaulting to false: no @JsonSetter(nulls = ...) annotations are generated and " + + "deserialization null-handling is governed entirely by the global ObjectMapper (7.23.0-equivalent " + + "output). Set '{}=false' to keep this behavior and silence this warning, or '{}=true' to emit " + + "@JsonSetter(nulls = ...) on optional non-nullable fields.", + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS, + CodegenConstants.GENERATE_JSON_SETTER_NULLS_ANNOTATIONS); + } + } + + /** + * Resolve the {@code @JsonInclude} policy into the single universal + * {@code x-jackson-json-include-policy} vendor extension the template emits, mutating {@code model.imports} + * and {@code property.vendorExtensions} in place. Precedence: + *
    + *
  1. A value set directly on the property (manual override in the spec) always wins.
    2. + *
  2. Otherwise, when {@code generateJsonIncludeAnnotations=true}, apply the automatic matrix: + *
      + *
    • required & non-nullable → {@code requiredNonNullablePolicy}
      • + *
    • required & nullable → {@code requiredNullablePolicy}
      • + *
    • optional & non-nullable → {@code optionalNonNullPropertyJsonInclude} + * (default {@code NON_NULL}, {@code NONE} = omit)
      • + *
    • optional & nullable → none (JsonNullable module already governs inclusion)
      • + *
    + *
    3. + *
+ * + *

The two "required" policies are supplied by the caller since the spring and kotlin-spring generators + * apply slightly different matrices there: kotlin-spring's non-nullable Kotlin types can never hold null, + * so it always uses {@code ALWAYS} for required properties, whereas spring uses {@code NON_NULL} for + * required-non-nullable (contract protection) and {@code ALWAYS} for required-nullable. + * + * @param model the model owning {@code property}, whose imports may be extended + * @param property the property to resolve the policy for + * @param generateJsonIncludeAnnotations the resolved {@code generateJsonIncludeAnnotations} state + * @param optionalNonNullPropertyJsonInclude the resolved {@code optionalNonNullPropertyJsonInclude} policy + * @param requiredNonNullablePolicy the policy to apply to required, non-nullable properties + * @param requiredNullablePolicy the policy to apply to required, nullable properties + */ + public static void resolveJsonIncludePolicy(CodegenModel model, CodegenProperty property, + TriStateBoolean generateJsonIncludeAnnotations, JsonIncludePolicy optionalNonNullPropertyJsonInclude, + JsonIncludePolicy requiredNonNullablePolicy, JsonIncludePolicy requiredNullablePolicy) { + if (property.vendorExtensions.containsKey(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName())) { + String manualPolicy = resolveManualJsonIncludePolicy( + property.vendorExtensions.get(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()), VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); + if (manualPolicy != null) { + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), manualPolicy); + model.imports.add("JsonInclude"); + } else { + // NONE / empty means "emit nothing"; drop the extension so the template renders no annotation. + property.vendorExtensions.remove(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName()); + } + return; + } + if (!generateJsonIncludeAnnotations.isTrue()) { + return; + } + JsonIncludePolicy policy = null; + if (property.required) { + policy = property.isNullable ? requiredNullablePolicy : requiredNonNullablePolicy; + } else if (!property.isNullable) { + policy = optionalNonNullPropertyJsonInclude; + } + if (policy != null && policy.isEmitted()) { + property.vendorExtensions.put(VendorExtension.X_JACKSON_JSON_INCLUDE_POLICY.getName(), policy.name()); + model.imports.add("JsonInclude"); + } + } + + /** + * Resolve which {@code @JsonSetter(nulls = ...)} annotation, if any, should be emitted for an optional, + * non-nullable property. + * + * @param generateJsonSetterNullsAnnotations the resolved {@code generateJsonSetterNullsAnnotations} state + * @param required whether the property is required + * @param nullable whether the property is nullable + * @param openApiNullable whether the generator's {@code openApiNullable} option is enabled + * @param failModeSupported whether this generator supports {@link JsonSetterNullsMode#FAIL} (kotlin-spring + * does; spring currently only ever emits {@link JsonSetterNullsMode#SKIP}) + * @return {@link JsonSetterNullsMode#NONE} unless the property is optional and non-nullable and + * {@code generateJsonSetterNullsAnnotations} is explicitly enabled; otherwise {@link JsonSetterNullsMode#FAIL} + * when {@code openApiNullable && failModeSupported}, {@link JsonSetterNullsMode#SKIP} when + * {@code !openApiNullable}, or {@link JsonSetterNullsMode#NONE} when {@code openApiNullable && !failModeSupported}. + */ + public static JsonSetterNullsMode resolveJsonSetterNullsMode(TriStateBoolean generateJsonSetterNullsAnnotations, + boolean required, boolean nullable, boolean openApiNullable, boolean failModeSupported) { + if (!generateJsonSetterNullsAnnotations.isTrue() || required || nullable) { + return JsonSetterNullsMode.NONE; + } + if (openApiNullable) { + return failModeSupported ? JsonSetterNullsMode.FAIL : JsonSetterNullsMode.NONE; + } + return JsonSetterNullsMode.SKIP; + } +} diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java deleted file mode 100644 index 2d4f8c59f732..000000000000 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonIncludePolicyUtils.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapitools.codegen.utils; - -import org.openapitools.codegen.CodegenConstants; - -/** - * Shared resolution/validation logic for the {@code x-jackson-json-include-policy} vendor extension and the - * {@code optionalNonNullPropertyJsonInclude} config option, used by both the {@code spring} and - * {@code kotlin-spring} generators (issue #24401). - */ -public final class JsonIncludePolicyUtils { - - /** Shared {@code CliOption} description for {@code optionalNonNullPropertyJsonInclude}. */ - public static final String OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE_DESC = - "The Jackson @JsonInclude policy emitted for optional, non-nullable model properties when " - + CodegenConstants.GENERATE_JSON_INCLUDE_ANNOTATIONS + " is true. " - + "NONE emits no annotation, deferring fully to the global ObjectMapper inclusion policy."; - - /** Shared {@code CliOption} description for {@code generateJsonIncludeAnnotations}. */ - public static final String GENERATE_JSON_INCLUDE_ANNOTATIONS_DESC = - "Whether to generate policy @JsonInclude annotations on model properties. When true, emits " - + "spec-honest annotations (required-field protection and the optional non-nullable policy from " - + CodegenConstants.OPTIONAL_NON_NULL_PROPERTY_JSON_INCLUDE + "). When false, none are generated and the global " - + "ObjectMapper owns inclusion. When left unset it defaults to false (7.23.0-equivalent output) and " - + "logs a warning; set it explicitly to silence the warning. A per-property override set via the " - + "`x-jackson-json-include-policy` vendor extension is always honored regardless of this flag."; - - private JsonIncludePolicyUtils() { - } - - /** - * Validate and normalize a manual per-property {@code x-jackson-json-include-policy} override. - * - * @param rawPolicy the raw vendor extension value set directly on the property in the spec - * @param extensionName the vendor extension key, used in the error message (kept generator-agnostic) - * @return the normalized (upper-case) policy name to emit, or {@code null} when the override means - * "emit no annotation" ({@code NONE}/blank), in which case the caller must drop the extension. - * @throws IllegalArgumentException when the override is not a valid {@code JsonInclude.Include} value. - */ - public static String resolveManualJsonIncludePolicy(Object rawPolicy, String extensionName) { - JsonIncludePolicy parsed; - try { - parsed = JsonIncludePolicy.parse(rawPolicy); - } catch (IllegalArgumentException e) { - throw new IllegalArgumentException(extensionName - + " must be a valid com.fasterxml.jackson.annotation.JsonInclude.Include value " - + "(ALWAYS, NON_NULL, NON_ABSENT, NON_EMPTY, NON_DEFAULT, USE_DEFAULTS, CUSTOM), or NONE to emit " - + "no annotation, but was: " + rawPolicy); - } - if (parsed == null || !parsed.isEmitted()) { - return null; - } - return parsed.name(); - } - - /** - * Validate and normalize the {@code optionalNonNullPropertyJsonInclude} config option value. - * - * @param policy the raw config option value (may be {@code null}, in which case the default - * {@code NON_NULL} is returned) - * @param optionName the config option name, used in the error message (kept generator-agnostic) - * @return the normalized (upper-case) policy name: one of {@code NON_NULL}, {@code NON_EMPTY}, - * {@code NON_DEFAULT}, {@code NONE}. - * @throws IllegalArgumentException when the value is not one of the supported policies. - */ - public static String normalizeJsonIncludePolicy(String policy, String optionName) { - if (policy == null) { - return JsonIncludePolicy.NON_NULL.name(); - } - JsonIncludePolicy parsed; - try { - parsed = JsonIncludePolicy.valueOf(policy.trim().toUpperCase(java.util.Locale.ROOT)); - } catch (IllegalArgumentException e) { - parsed = null; - } - if (parsed == null || !parsed.isValidOptionalNonNullPolicy()) { - throw new IllegalArgumentException(optionName - + " must be one of " + JsonIncludePolicy.OPTIONAL_NON_NULL_POLICIES + " but was: " + policy); - } - return parsed.name(); - } -} From bd6d3f1003fa89c9ea86811679cacafed56cf07e Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Thu, 30 Jul 2026 15:09:02 +0200 Subject: [PATCH 20/20] update samples --- .../kotlin-spring-cloud-4/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../petstore/kotlin-spring-cloud-4/pom.xml | 2 +- .../kotlin/org/openapitools/model/Category.kt | 7 ------- .../openapitools/model/ModelApiResponse.kt | 9 --------- .../kotlin/org/openapitools/model/Order.kt | 15 --------------- .../main/kotlin/org/openapitools/model/Pet.kt | 11 ----------- .../main/kotlin/org/openapitools/model/Tag.kt | 7 ------- .../kotlin/org/openapitools/model/User.kt | 19 ------------------- 9 files changed, 3 insertions(+), 71 deletions(-) diff --git a/samples/server/petstore/kotlin-spring-cloud-4/build.gradle.kts b/samples/server/petstore/kotlin-spring-cloud-4/build.gradle.kts index ce19f0a90dab..e05be7009335 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-cloud-4/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-webmvc") implementation("com.google.code.findbugs:jsr305:3.0.2") - val jackson3Version = "3.1.0" + val jackson3Version = "3.1.5" implementation("tools.jackson.dataformat:jackson-dataformat-yaml:$jackson3Version") implementation("tools.jackson.dataformat:jackson-dataformat-xml:$jackson3Version") implementation("tools.jackson.module:jackson-module-kotlin:$jackson3Version") diff --git a/samples/server/petstore/kotlin-spring-cloud-4/gradle/wrapper/gradle-wrapper.properties b/samples/server/petstore/kotlin-spring-cloud-4/gradle/wrapper/gradle-wrapper.properties index ca025c83a7cc..4f5eb9dcc0ef 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/gradle/wrapper/gradle-wrapper.properties +++ b/samples/server/petstore/kotlin-spring-cloud-4/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/samples/server/petstore/kotlin-spring-cloud-4/pom.xml b/samples/server/petstore/kotlin-spring-cloud-4/pom.xml index 54f1e792ebad..1d70ea0f2049 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/pom.xml +++ b/samples/server/petstore/kotlin-spring-cloud-4/pom.xml @@ -8,7 +8,7 @@ 1.0.0 3.0.2 - 3.1.0 + 3.1.5 3.0.0 2.2.0 diff --git a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Category.kt index f44ed4c7ace6..84485a66eb96 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Category.kt @@ -1,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,14 +19,10 @@ import jakarta.validation.Valid */ data class Category( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 8d84914db2ba..bc1eb76d4b71 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -1,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -23,18 +20,12 @@ import jakarta.validation.Valid */ data class ModelApiResponse( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Order.kt index 486848e14599..e865644bd4f8 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Order.kt @@ -2,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,33 +25,21 @@ import jakarta.validation.Valid */ data class Order( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Pet.kt index 56c523367969..472eb39902dc 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Pet.kt @@ -2,11 +2,8 @@ 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 -import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag import jakarta.validation.constraints.DecimalMax @@ -36,26 +33,18 @@ data class Pet( @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Tag.kt index e3ec341838e6..f60b101132b0 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/Tag.kt @@ -1,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -22,13 +19,9 @@ import jakarta.validation.Valid */ data class Tag( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/User.kt index 93294737c422..3fcde2466802 100644 --- a/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-cloud-4/src/main/kotlin/org/openapitools/model/User.kt @@ -1,10 +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 import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -28,43 +25,27 @@ import jakarta.validation.Valid */ data class User( - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @field:JsonInclude(JsonInclude.Include.NON_NULL) - @field:JsonSetter(nulls = Nulls.SKIP) @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable {