From 71c2abf81c66f76ba73aee793275377f43df4deb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 16 Feb 2023 10:37:36 +0800 Subject: [PATCH] [Java] fix default value for JsonNullable (#14703) * fix java webclient default value * update default value in java okhttp client * fix java native client default value in JsonNullable * improve java okhttp-gson default value template * update java rest-related templates * update feign samples * update jersey3 templates * update jersey2 templates * update default value in jaxrs templates * fix spring default value * update jaxrs pojo, fix tests * update samples * suport set --- .../languages/AbstractJavaCodegen.java | 4 +- .../Java/libraries/jersey2/pojo.mustache | 13 ++- .../Java/libraries/jersey3/pojo.mustache | 13 ++- .../Java/libraries/native/pojo.mustache | 11 +-- .../Java/libraries/okhttp-gson/pojo.mustache | 13 ++- .../src/main/resources/Java/pojo.mustache | 10 ++- .../resources/JavaJaxRS/cxf-cdi/pojo.mustache | 10 +-- .../resources/JavaJaxRS/cxf-ext/pojo.mustache | 5 -- .../resources/JavaJaxRS/cxf/pojo.mustache | 9 +-- .../main/resources/JavaJaxRS/pojo.mustache | 9 +-- .../resources/JavaJaxRS/spec/pojo.mustache | 9 +-- .../main/resources/JavaSpring/pojo.mustache | 4 +- .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 80 +++++++++---------- .../client/model/DefaultValue.java | 2 +- .../client/model/DefaultValue.java | 5 +- .../client/model/DefaultValue.java | 2 +- .../client/model/DefaultValue.java | 15 ++-- .../org/openapitools/client/model/Pet.java | 2 +- .../org/openapitools/client/model/Query.java | 2 +- ...deTrueArrayStringQueryObjectParameter.java | 2 +- .../client/model/NullableClass.java | 8 +- .../client/model/NullableClass.java | 8 +- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../openapitools/client/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../openapitools/client/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 8 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../client/model/NullableClass.java | 12 +-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../client/model/NullableClass.java | 8 +- .../client/model/NullableClass.java | 8 +- .../org/openapitools/client/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../openapitools/client/model/XmlItem.java | 18 ++--- .../org/openapitools/client/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../openapitools/client/model/XmlItem.java | 18 ++--- .../org/openapitools/client/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 8 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfInlineAllOf.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../client/model/NullableClass.java | 24 ++---- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 40 ++-------- .../model/ArrayOfArrayOfNumberOnly.java | 5 +- .../client/model/ArrayOfNumberOnly.java | 5 +- .../openapitools/client/model/ArrayTest.java | 15 +--- .../openapitools/client/model/EnumArrays.java | 5 +- .../client/model/FileSchemaTestClass.java | 5 +- .../openapitools/client/model/MapTest.java | 20 +---- ...ropertiesAndAdditionalPropertiesClass.java | 5 +- .../org/openapitools/client/model/Pet.java | 7 +- .../client/model/TypeHolderDefault.java | 2 +- .../client/model/TypeHolderExample.java | 2 +- .../openapitools/client/model/XmlItem.java | 45 +++-------- .../client/model/NullableClass.java | 8 +- .../model/AdditionalPropertiesClass.java | 10 +-- .../model/ArrayOfArrayOfNumberOnly.java | 5 +- .../client/model/ArrayOfNumberOnly.java | 5 +- .../openapitools/client/model/ArrayTest.java | 15 +--- .../openapitools/client/model/EnumArrays.java | 5 +- .../client/model/FileSchemaTestClass.java | 5 +- .../openapitools/client/model/MapTest.java | 20 +---- ...ropertiesAndAdditionalPropertiesClass.java | 5 +- .../client/model/NullableClass.java | 18 ++--- .../model/ObjectWithDeprecatedFields.java | 5 +- .../org/openapitools/client/model/Pet.java | 7 +- .../org/openapitools/client/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 8 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../openapitools/client/model/Drawing.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../openapitools/client/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../client/model/NullableClass.java | 12 +-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../server/model/NullableClass.java | 8 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/Category.java | 1 - .../openapitools/model/ModelApiResponse.java | 1 - .../java/org/openapitools/model/Order.java | 1 - .../gen/java/org/openapitools/model/Pet.java | 3 +- .../gen/java/org/openapitools/model/Tag.java | 1 - .../gen/java/org/openapitools/model/User.java | 1 - .../gen/java/org/openapitools/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../org/openapitools/model/NullableClass.java | 20 ++--- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/AdditionalPropertiesClass.java | 16 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 6 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 8 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 ++--- .../model/ObjectWithUniqueItems.java | 4 +- 230 files changed, 645 insertions(+), 839 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index f316cee81a9..4e1fdcfbe50 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1038,7 +1038,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code if (ModelUtils.isArraySchema(schema)) { if (schema.getDefault() == null) { if (cp.isNullable || containerDefaultToNull) { // nullable or containerDefaultToNull set to true - return "null"; + return null; } else { if (ModelUtils.isSet(schema)) { return String.format(Locale.ROOT, "new %s<>()", @@ -1061,7 +1061,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } if (cp.isNullable || containerDefaultToNull) { // nullable or containerDefaultToNull set to true - return "null"; + return null; } if (getAdditionalProperties(schema) == null) { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index fd574fcc7f3..255be1f0991 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -82,12 +82,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{/vars}} @@ -136,7 +131,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); @@ -147,9 +142,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.add({{name}}Item); return this; @@ -161,7 +158,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } try { this.{{name}}.get().put(key, {{name}}Item); @@ -172,9 +169,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache index 5b9771df628..c116c66654d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache @@ -82,12 +82,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{/vars}} @@ -136,7 +131,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); @@ -147,9 +142,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.add({{name}}Item); return this; @@ -161,7 +158,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } try { this.{{name}}.get().put(key, {{name}}Item); @@ -172,9 +169,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index c3033cee846..bdfa5eb4df7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -82,12 +82,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{^defaultValue}} = null{{/defaultValue}}{{/required}}; - {{/isContainer}} - {{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{/vars}} @@ -136,7 +131,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); @@ -161,7 +156,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } try { this.{{name}}.get().put(key, {{name}}Item); @@ -172,9 +167,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache index c8c69eaf5b0..bd86563c983 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache @@ -101,12 +101,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} {{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{/vars}} @@ -153,7 +148,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); @@ -164,9 +159,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.add({{name}}Item); return this; @@ -178,7 +175,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } try { this.{{name}}.get().put(key, {{name}}Item); @@ -189,9 +186,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index def29af99be..3313a2cbdc3 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -84,7 +84,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{^defaultValue}} = null{{/defaultValue}}{{/required}}; + private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; {{/isContainer}} {{^isContainer}} {{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; @@ -134,7 +134,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}null{{/defaultValue}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); @@ -145,9 +145,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.add({{name}}Item); return this; @@ -159,7 +161,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } try { this.{{name}}.get().put(key, {{name}}Item); @@ -170,9 +172,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} + {{#defaultValue}} if (this.{{name}} == null) { this.{{name}} = {{{defaultValue}}}; } + {{/defaultValue}} {{/required}} this.{{name}}.put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache index 6431e7e7d83..0e071a15317 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache @@ -18,12 +18,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} -{{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}}; -{{/isContainer}} -{{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; -{{/isContainer}}{{/vars}} + {{/vars}} {{#vars}} /** @@ -57,7 +53,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } {{/required}} this.{{name}}.add({{name}}Item); @@ -70,7 +66,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } {{/required}} this.{{name}}.put(key, {{name}}Item); diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache index 39cae406476..3565a65bc82 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache @@ -51,12 +51,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} -{{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}}; -{{/isContainer}} -{{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; -{{/isContainer}} {{/vars}} {{#vars}} /** diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache index 90d86269f5d..ee2a028a2ad 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -47,12 +47,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{/vars}} {{#vars}} @@ -156,7 +151,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}); } this.{{name}}.get().add({{name}}Item); return this; @@ -172,7 +167,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}); } this.{{name}}.get().put(key, {{name}}Item); return this; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache index 966956916b5..ed27882f268 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache @@ -36,12 +36,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} - {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vars}} {{#vars}} @@ -54,7 +49,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } {{/required}} this.{{name}}.add({{name}}Item); @@ -66,7 +61,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } {{/required}} this.{{name}}.put(key, {{name}}Item); diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache index 071a73e0c0f..6a913dccb3a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -31,12 +31,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} - {{#isContainer}} - private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#required}}{{^isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isNullable}}{{#isNullable}} = null{{/isNullable}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; - {{/isContainer}} {{/vars}} {{#generateBuilders}} {{^additionalProperties}} @@ -88,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}; } this.{{name}}.add({{name}}Item); @@ -106,7 +101,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } this.{{name}}.put(key, {{name}}Item); diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 193cc332822..6217ac15abf 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -96,7 +96,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{#openApiNullable}} {{^required}} if (this.{{name}} == null{{#isNullable}} || !this.{{name}}.isPresent(){{/isNullable}}) { - this.{{name}} = {{#isNullable}}JsonNullable.of({{{defaultValue}}}){{/isNullable}}{{^isNullable}}{{{defaultValue}}}{{/isNullable}}; + this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}{{#isNullable}}){{/isNullable}}; } {{/required}} this.{{name}}{{#isNullable}}.get(){{/isNullable}}.add({{name}}Item); @@ -115,7 +115,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}; } {{/required}} this.{{name}}.put(key, {{name}}Item); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index 48af9282fdf..c9b9e27a4c7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -379,15 +379,15 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/setParameter.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/setParameter.yaml", null, new ParseOptions()).getOpenAPI(); codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(false); generator.opts(input).generate(); @@ -404,15 +404,15 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/setResponse.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/setResponse.yaml", null, new ParseOptions()).getOpenAPI(); codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.opts(input).generate(); @@ -450,7 +450,7 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { "\nimport java.util.concurrent.CompletableFuture;\n", "\npublic CompletionStage pingGet() {\n", "\nCompletableFuture.supplyAsync(() -> Response.ok().entity(\"magic!\").build())\n" - ); + ); } @Test @@ -507,7 +507,7 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { //And the generated interface contains CompletionStage TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/api/PingApi.java"); - assertFileContains(output.toPath().resolve( "src/gen/java/org/openapitools/api/PingApi.java"), + assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/api/PingApi.java"), "\nimport java.util.concurrent.CompletionStage;\n", "\nCompletionStage pingGet();\n"); } @@ -620,70 +620,70 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/issue_8535.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/issue_8535.yaml", null, new ParseOptions()).getOpenAPI(); codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("TestHeadersApi.java")) - .assertMethod("headersTest") + .assertMethod("headersTest") .hasParameter("headerNumber").withType("BigDecimal") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"11.2\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"11.2\"")) .toParameter().toMethod() .hasParameter("headerString").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) .toParameter().toMethod() .hasParameter("headerStringWrapped").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) .toParameter().toMethod() .hasParameter("headerStringQuotes").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) .toParameter().toMethod() .hasParameter("headerStringQuotesWrapped").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) .toParameter().toMethod() .hasParameter("headerBoolean").withType("Boolean") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"true\"")); + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"true\"")); JavaFileAssert.assertThat(files.get("TestQueryParamsApi.java")) - .assertMethod("queryParamsTest") + .assertMethod("queryParamsTest") .hasParameter("queryNumber").withType("BigDecimal") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"11.2\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"11.2\"")) .toParameter().toMethod() .hasParameter("queryString").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) .toParameter().toMethod() .hasParameter("queryStringWrapped").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\"")) .toParameter().toMethod() .hasParameter("queryStringQuotes").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) .toParameter().toMethod() .hasParameter("queryStringQuotesWrapped").withType("String") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"qwerty\\\"with quotes\\\" test\"")) .toParameter().toMethod() .hasParameter("queryBoolean").withType("Boolean") - .assertParameterAnnotations() - .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"true\"")); + .assertParameterAnnotations() + .containsWithNameAndAttributes("DefaultValue", ImmutableMap.of("value", "\"true\"")); } @Test @@ -711,12 +711,12 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { //And the generated model contains correct default value for array properties (optional) TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/Body.java"); assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/Body.java"), - "\nprivate @Valid List arrayThatIsNull = null;\n"); + "\nprivate @Valid List arrayThatIsNull;\n"); //And the generated model contains correct default value for array properties (required, nullable) TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/BodyWithRequiredNullable.java"); assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/BodyWithRequiredNullable.java"), - "\nprivate @Valid List arrayThatIsNull = null;\n"); + "\nprivate @Valid List arrayThatIsNull;\n"); //And the generated model contains correct default value for array properties (required) TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/BodyWithRequired.java"); diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java index 888a1332816..859afd7a981 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -286,7 +286,7 @@ public class DefaultValue { public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { if (this.arrayStringNullable == null || !this.arrayStringNullable.isPresent()) { - this.arrayStringNullable = JsonNullable.>of(null); + this.arrayStringNullable = JsonNullable.>of(new ArrayList<>()); } try { this.arrayStringNullable.get().add(arrayStringNullableItem); diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java index 42c69e8a2b4..84ac9669049 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -102,7 +102,7 @@ public class DefaultValue { public static final String SERIALIZED_NAME_ARRAY_STRING_NULLABLE = "array_string_nullable"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_NULLABLE) - private List arrayStringNullable = null; + private List arrayStringNullable; public static final String SERIALIZED_NAME_STRING_NULLABLE = "string_nullable"; @SerializedName(SERIALIZED_NAME_STRING_NULLABLE) @@ -268,9 +268,6 @@ public class DefaultValue { } public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { - if (this.arrayStringNullable == null) { - this.arrayStringNullable = null; - } this.arrayStringNullable.add(arrayStringNullableItem); return this; } diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java index ff6d609c5b4..28f3c70e634 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -282,7 +282,7 @@ public class DefaultValue { public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { if (this.arrayStringNullable == null || !this.arrayStringNullable.isPresent()) { - this.arrayStringNullable = JsonNullable.>of(null); + this.arrayStringNullable = JsonNullable.>of(new ArrayList<>()); } try { this.arrayStringNullable.get().add(arrayStringNullableItem); diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java index 294d0c28118..420af1f7ff6 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -54,7 +54,7 @@ import org.openapitools.client.JSON; public class DefaultValue { public static final String SERIALIZED_NAME_ARRAY_STRING_ENUM_REF_DEFAULT = "array_string_enum_ref_default"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_ENUM_REF_DEFAULT) - private List arrayStringEnumRefDefault = null; + private List arrayStringEnumRefDefault = new ArrayList<>(Arrays.asList(StringEnumRef.SUCCESS, StringEnumRef.FAILURE)); /** * Gets or Sets arrayStringEnumDefault @@ -107,23 +107,23 @@ public class DefaultValue { public static final String SERIALIZED_NAME_ARRAY_STRING_ENUM_DEFAULT = "array_string_enum_default"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_ENUM_DEFAULT) - private List arrayStringEnumDefault = null; + private List arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); public static final String SERIALIZED_NAME_ARRAY_STRING_DEFAULT = "array_string_default"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_DEFAULT) - private List arrayStringDefault = null; + private List arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); public static final String SERIALIZED_NAME_ARRAY_INTEGER_DEFAULT = "array_integer_default"; @SerializedName(SERIALIZED_NAME_ARRAY_INTEGER_DEFAULT) - private List arrayIntegerDefault = null; + private List arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); public static final String SERIALIZED_NAME_ARRAY_STRING = "array_string"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING) - private List arrayString = null; + private List arrayString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_STRING_NULLABLE = "array_string_nullable"; @SerializedName(SERIALIZED_NAME_ARRAY_STRING_NULLABLE) - private List arrayStringNullable = null; + private List arrayStringNullable; public static final String SERIALIZED_NAME_STRING_NULLABLE = "string_nullable"; @SerializedName(SERIALIZED_NAME_STRING_NULLABLE) @@ -289,9 +289,6 @@ public class DefaultValue { } public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { - if (this.arrayStringNullable == null) { - this.arrayStringNullable = null; - } this.arrayStringNullable.add(arrayStringNullableItem); return this; } diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index abb01019943..c3aa75d476b 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java index 4ec58288899..9133959e1c4 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java @@ -105,7 +105,7 @@ public class Query { public static final String SERIALIZED_NAME_OUTCOMES = "outcomes"; @SerializedName(SERIALIZED_NAME_OUTCOMES) - private List outcomes = null; + private List outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); public Query() { } diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index 6d77f708310..3ef95c1c7bd 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -52,7 +52,7 @@ import org.openapitools.client.JSON; public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String SERIALIZED_NAME_VALUES = "values"; @SerializedName(SERIALIZED_NAME_VALUES) - private List values = null; + private List values = new ArrayList<>(); public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java index 6c0930e4f2d..78694271007 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -308,7 +308,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -354,7 +354,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -434,7 +434,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -480,7 +480,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java index 73fba7619e9..c54aefee932 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java @@ -305,7 +305,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -431,7 +431,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -477,7 +477,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index f030c0bf208..d304be210e5 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -49,28 +49,28 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 64bbd05c05a..a4940ec1ec6 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 625a68340d3..a2679d903aa 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java index 30ba0b5ec1f..337c357f30e 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java index ded5072fea3..618d07b460a 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index d69d7dde108..fa760cf7ab3 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MapTest.java index 64411d7e5ae..8f74fc51ee6 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MapTest.java @@ -40,7 +40,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -78,13 +78,13 @@ public class MapTest { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ff3e73deeb3..5cb5028b114 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private LocalDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java index 9a561d4806f..5c1d067af62 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java index f68184b4e65..6db436d4841 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/XmlItem.java @@ -78,7 +78,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -93,10 +93,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -111,10 +111,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -129,10 +129,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -147,10 +147,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index f030c0bf208..d304be210e5 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -49,28 +49,28 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 64bbd05c05a..a4940ec1ec6 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 625a68340d3..a2679d903aa 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java index 30ba0b5ec1f..337c357f30e 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java index ded5072fea3..618d07b460a 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index d69d7dde108..fa760cf7ab3 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java index 64411d7e5ae..8f74fc51ee6 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java @@ -40,7 +40,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -78,13 +78,13 @@ public class MapTest { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e7bdc28485e..402c5b5e3b9 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java index 9a561d4806f..5c1d067af62 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java index f68184b4e65..6db436d4841 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java @@ -78,7 +78,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -93,10 +93,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -111,10 +111,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -129,10 +129,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -147,10 +147,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 5a7003226fb..268ac6798e4 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -48,10 +48,10 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private JsonNullable anytype1 = JsonNullable.of(null); @@ -63,13 +63,13 @@ public class AdditionalPropertiesClass { private Object mapWithUndeclaredPropertiesAnytype2; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3 = "map_with_undeclared_properties_anytype_3"; - private Map mapWithUndeclaredPropertiesAnytype3 = null; + private Map mapWithUndeclaredPropertiesAnytype3 = new HashMap<>(); public static final String JSON_PROPERTY_EMPTY_MAP = "empty_map"; private Object emptyMap; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING = "map_with_undeclared_properties_string"; - private Map mapWithUndeclaredPropertiesString = null; + private Map mapWithUndeclaredPropertiesString = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 0051fe3544c..e100f429780 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 5db1e059a46..a2043e449ce 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java index 271e2213de5..63418199ab0 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java index a60a0f5f4b5..c5eaa771d2f 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java @@ -61,7 +61,7 @@ public class Drawing { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = null; + private List shapes = new ArrayList<>(); public Drawing() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java index f37fcfd35ad..8830dd2f510 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 865705825e9..483524bac85 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java index ea51e9974a3..6a334488f30 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java @@ -40,7 +40,7 @@ import org.openapitools.client.JSON; @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -78,13 +78,13 @@ public class MapTest { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 2952f15468e..d8a9ffb07f8 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java index 9578c71d46b..2b68e8615f3 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java @@ -85,7 +85,7 @@ public class NullableClass { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -94,7 +94,7 @@ public class NullableClass { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } @@ -304,7 +304,7 @@ public class NullableClass { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -349,7 +349,7 @@ public class NullableClass { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -427,7 +427,7 @@ public class NullableClass { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -472,7 +472,7 @@ public class NullableClass { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 71e06712bf8..31b94b0a7b4 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java index 0c11be52261..6339f08e4cc 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java index e4b797da53a..9f20bc8b9c8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java @@ -306,7 +306,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -429,7 +429,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -474,7 +474,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java index e4b797da53a..9f20bc8b9c8 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java @@ -306,7 +306,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -429,7 +429,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -474,7 +474,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java index e82a8626bb0..7c1fae69427 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index d47643ace76..006cdfcb8fa 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -54,35 +54,35 @@ import org.openapitools.client.JSON; public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_STRING = "map_string"; @SerializedName(SERIALIZED_NAME_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number"; @SerializedName(SERIALIZED_NAME_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer"; @SerializedName(SERIALIZED_NAME_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean"; @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype"; @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index af074b0000f..b6cf6e52eb1 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 7f826c0e0d0..639eb6c8bf2 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java index 162b6f49879..2fc0d3d7f92 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -53,15 +53,15 @@ import org.openapitools.client.JSON; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java index 615d27ee353..566409f6633 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -150,7 +150,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f7b58ca5aa2..3dc6b5924c9 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -57,7 +57,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java index 975ea6eb5bb..98cb4a9180b 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java @@ -52,7 +52,7 @@ import org.openapitools.client.JSON; public class MapTest { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -103,15 +103,15 @@ public class MapTest { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 28dcd260ac0..caefdc1f710 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -63,7 +63,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java index b06ae0eecd4..58b63bd27f1 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java @@ -72,7 +72,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java index 60423c8e1e4..135caa7cf2b 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/XmlItem.java @@ -69,7 +69,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -89,11 +89,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -113,11 +113,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -137,11 +137,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -161,11 +161,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java index e82a8626bb0..7c1fae69427 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 0135ec5e084..e34bad23220 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -56,35 +56,35 @@ import org.openapitools.client.JSON; public class AdditionalPropertiesClass implements Parcelable { public static final String SERIALIZED_NAME_MAP_STRING = "map_string"; @SerializedName(SERIALIZED_NAME_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number"; @SerializedName(SERIALIZED_NAME_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer"; @SerializedName(SERIALIZED_NAME_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean"; @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype"; @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 42afbbd18ef..680c33333fe 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -55,7 +55,7 @@ import org.openapitools.client.JSON; public class ArrayOfArrayOfNumberOnly implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 15801fb6b5e..dd8784f0c42 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -55,7 +55,7 @@ import org.openapitools.client.JSON; public class ArrayOfNumberOnly implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java index 13328aed2dc..ee1148a6f40 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -55,15 +55,15 @@ import org.openapitools.client.JSON; public class ArrayTest implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java index 532e72015ae..e994ab72859 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -152,7 +152,7 @@ public class EnumArrays implements Parcelable { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 5e95b62d545..438216ebfc3 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -59,7 +59,7 @@ public class FileSchemaTestClass implements Parcelable { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java index 28d6a34d1fd..fb2c20ffb53 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java @@ -54,7 +54,7 @@ import org.openapitools.client.JSON; public class MapTest implements Parcelable { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -105,15 +105,15 @@ public class MapTest implements Parcelable { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ba8329b2c04..8c74b80fa60 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -65,7 +65,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java index e0698b5eaf9..93057136b3e 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java @@ -74,7 +74,7 @@ public class Pet implements Parcelable { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java index 3f060ab700b..78df14807d7 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java @@ -71,7 +71,7 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -91,11 +91,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -115,11 +115,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -139,11 +139,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -163,11 +163,11 @@ public class XmlItem implements Parcelable { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java index 7e20756fb07..1deb29bce92 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -73,7 +73,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 80b994c0a72..fed849a0228 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -53,11 +53,11 @@ import org.openapitools.client.JSON; public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_PROPERTY = "map_property"; @SerializedName(SERIALIZED_NAME_MAP_PROPERTY) - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_OF_MAP_PROPERTY = "map_of_map_property"; @SerializedName(SERIALIZED_NAME_MAP_OF_MAP_PROPERTY) - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) @@ -73,7 +73,7 @@ public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3 = "map_with_undeclared_properties_anytype_3"; @SerializedName(SERIALIZED_NAME_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3) - private Map mapWithUndeclaredPropertiesAnytype3 = null; + private Map mapWithUndeclaredPropertiesAnytype3 = new HashMap<>(); public static final String SERIALIZED_NAME_EMPTY_MAP = "empty_map"; @SerializedName(SERIALIZED_NAME_EMPTY_MAP) @@ -81,7 +81,7 @@ public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_WITH_UNDECLARED_PROPERTIES_STRING = "map_with_undeclared_properties_string"; @SerializedName(SERIALIZED_NAME_MAP_WITH_UNDECLARED_PROPERTIES_STRING) - private Map mapWithUndeclaredPropertiesString = null; + private Map mapWithUndeclaredPropertiesString = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index d8b8520638d..0943e3784a8 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java index 8d4287ee23f..eac6d0db48c 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java @@ -61,7 +61,7 @@ public class ArrayOfInlineAllOf { public static final String SERIALIZED_NAME_ARRAY_ALLOF_DOG_PROPERTY = "array_allof_dog_property"; @SerializedName(SERIALIZED_NAME_ARRAY_ALLOF_DOG_PROPERTY) - private List arrayAllofDogProperty = null; + private List arrayAllofDogProperty = new ArrayList<>(); public ArrayOfInlineAllOf() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 8a2d5232478..71e3dc1b732 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -53,7 +53,7 @@ import org.openapitools.client.JSON; public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java index 8bbfae30736..2c5560b7bb0 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -53,15 +53,15 @@ import org.openapitools.client.JSON; public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java index 8f0c08deba1..f350beb95ea 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Drawing.java @@ -69,7 +69,7 @@ public class Drawing { public static final String SERIALIZED_NAME_SHAPES = "shapes"; @SerializedName(SERIALIZED_NAME_SHAPES) - private List shapes = null; + private List shapes = new ArrayList<>(); public Drawing() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java index 8bf16a25a81..257fc4ad721 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -150,7 +150,7 @@ public class EnumArrays { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 2f0f5831b71..b16ea52b210 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -57,7 +57,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java index 642cb06aab0..b4b0c57a367 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java @@ -52,7 +52,7 @@ import org.openapitools.client.JSON; public class MapTest { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -103,15 +103,15 @@ public class MapTest { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index bbfdee31099..58837c0c1ec 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -63,7 +63,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java index 3320fa1cd24..2bd3ac824c2 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java @@ -82,27 +82,27 @@ public class NullableClass { public static final String SERIALIZED_NAME_ARRAY_NULLABLE_PROP = "array_nullable_prop"; @SerializedName(SERIALIZED_NAME_ARRAY_NULLABLE_PROP) - private List arrayNullableProp = null; + private List arrayNullableProp; public static final String SERIALIZED_NAME_ARRAY_AND_ITEMS_NULLABLE_PROP = "array_and_items_nullable_prop"; @SerializedName(SERIALIZED_NAME_ARRAY_AND_ITEMS_NULLABLE_PROP) - private List arrayAndItemsNullableProp = null; + private List arrayAndItemsNullableProp; public static final String SERIALIZED_NAME_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; @SerializedName(SERIALIZED_NAME_ARRAY_ITEMS_NULLABLE) - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String SERIALIZED_NAME_OBJECT_NULLABLE_PROP = "object_nullable_prop"; @SerializedName(SERIALIZED_NAME_OBJECT_NULLABLE_PROP) - private Map objectNullableProp = null; + private Map objectNullableProp; public static final String SERIALIZED_NAME_OBJECT_AND_ITEMS_NULLABLE_PROP = "object_and_items_nullable_prop"; @SerializedName(SERIALIZED_NAME_OBJECT_AND_ITEMS_NULLABLE_PROP) - private Map objectAndItemsNullableProp = null; + private Map objectAndItemsNullableProp; public static final String SERIALIZED_NAME_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; @SerializedName(SERIALIZED_NAME_OBJECT_ITEMS_NULLABLE) - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } @@ -246,9 +246,6 @@ public class NullableClass { } public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { - if (this.arrayNullableProp == null) { - this.arrayNullableProp = null; - } this.arrayNullableProp.add(arrayNullablePropItem); return this; } @@ -276,9 +273,6 @@ public class NullableClass { } public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { - if (this.arrayAndItemsNullableProp == null) { - this.arrayAndItemsNullableProp = null; - } this.arrayAndItemsNullableProp.add(arrayAndItemsNullablePropItem); return this; } @@ -336,9 +330,6 @@ public class NullableClass { } public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { - if (this.objectNullableProp == null) { - this.objectNullableProp = null; - } this.objectNullableProp.put(key, objectNullablePropItem); return this; } @@ -366,9 +357,6 @@ public class NullableClass { } public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { - if (this.objectAndItemsNullableProp == null) { - this.objectAndItemsNullableProp = null; - } this.objectAndItemsNullableProp.put(key, objectAndItemsNullablePropItem); return this; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1186d9bd915..3d651830fef 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -66,7 +66,7 @@ public class ObjectWithDeprecatedFields { public static final String SERIALIZED_NAME_BARS = "bars"; @SerializedName(SERIALIZED_NAME_BARS) - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index a14813e2f38..1d885d0acea 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -70,7 +70,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index ed8d48698b1..765ed621329 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -46,28 +46,28 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString; public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber; public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger; public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean; public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger; public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype; public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString; public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype; public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; @@ -88,9 +88,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { - if (this.mapString == null) { - this.mapString = null; - } this.mapString.put(key, mapStringItem); return this; } @@ -122,9 +119,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { - if (this.mapNumber == null) { - this.mapNumber = null; - } this.mapNumber.put(key, mapNumberItem); return this; } @@ -156,9 +150,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { - if (this.mapInteger == null) { - this.mapInteger = null; - } this.mapInteger.put(key, mapIntegerItem); return this; } @@ -190,9 +181,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { - if (this.mapBoolean == null) { - this.mapBoolean = null; - } this.mapBoolean.put(key, mapBooleanItem); return this; } @@ -224,9 +212,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { - if (this.mapArrayInteger == null) { - this.mapArrayInteger = null; - } this.mapArrayInteger.put(key, mapArrayIntegerItem); return this; } @@ -258,9 +243,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { - if (this.mapArrayAnytype == null) { - this.mapArrayAnytype = null; - } this.mapArrayAnytype.put(key, mapArrayAnytypeItem); return this; } @@ -292,9 +274,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { - if (this.mapMapString == null) { - this.mapMapString = null; - } this.mapMapString.put(key, mapMapStringItem); return this; } @@ -326,9 +305,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { - if (this.mapMapAnytype == null) { - this.mapMapAnytype = null; - } this.mapMapAnytype.put(key, mapMapAnytypeItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7729eedac4b..458dcd501b7 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } @@ -47,9 +47,6 @@ public class ArrayOfArrayOfNumberOnly { } public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = null; - } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 20fa6c02c33..1bf6b6eca33 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber; public ArrayOfNumberOnly() { } @@ -47,9 +47,6 @@ public class ArrayOfNumberOnly { } public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - if (this.arrayNumber == null) { - this.arrayNumber = null; - } this.arrayNumber.add(arrayNumberItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java index fb1542f33ba..6fa67a39efd 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel; public ArrayTest() { } @@ -55,9 +55,6 @@ public class ArrayTest { } public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - if (this.arrayOfString == null) { - this.arrayOfString = null; - } this.arrayOfString.add(arrayOfStringItem); return this; } @@ -89,9 +86,6 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = null; - } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; } @@ -123,9 +117,6 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { - if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = null; - } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java index 46e76d1f743..4e390827d8a 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum; public EnumArrays() { } @@ -146,9 +146,6 @@ public class EnumArrays { } public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - if (this.arrayEnum == null) { - this.arrayEnum = null; - } this.arrayEnum.add(arrayEnumItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 0db455cb632..d6a00997d93 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files; public FileSchemaTestClass() { } @@ -77,9 +77,6 @@ public class FileSchemaTestClass { } public FileSchemaTestClass addFilesItem(ModelFile filesItem) { - if (this.files == null) { - this.files = null; - } this.files.add(filesItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java index 3d6c7ba4f45..dc7486f4194 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString; /** * Gets or Sets inner @@ -75,13 +75,13 @@ public class MapTest { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString; public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap; public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap; public MapTest() { } @@ -93,9 +93,6 @@ public class MapTest { } public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { - if (this.mapMapOfString == null) { - this.mapMapOfString = null; - } this.mapMapOfString.put(key, mapMapOfStringItem); return this; } @@ -127,9 +124,6 @@ public class MapTest { } public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { - if (this.mapOfEnumString == null) { - this.mapOfEnumString = null; - } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; } @@ -161,9 +155,6 @@ public class MapTest { } public MapTest putDirectMapItem(String key, Boolean directMapItem) { - if (this.directMap == null) { - this.directMap = null; - } this.directMap.put(key, directMapItem); return this; } @@ -195,9 +186,6 @@ public class MapTest { } public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { - if (this.indirectMap == null) { - this.indirectMap = null; - } this.indirectMap.put(key, indirectMapItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 340223cd136..e7f63f4af67 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map; public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -109,9 +109,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = null; - } this.map.put(key, mapItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java index 6c5498646bc..beca2d006a6 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java @@ -53,10 +53,10 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private Set photoUrls = null; + private Set photoUrls; public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags; /** * pet status in the store @@ -218,9 +218,6 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (this.tags == null) { - this.tags = null; - } this.tags.add(tagsItem); return this; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index e5e89635ca8..0aea34bdbc6 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -51,7 +51,7 @@ public class TypeHolderDefault { private Boolean boolItem = true; public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item"; - private List arrayItem = null; + private List arrayItem; public TypeHolderDefault() { } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 9f3f9cb3f36..21904a8fefe 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -55,7 +55,7 @@ public class TypeHolderExample { private Boolean boolItem; public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item"; - private List arrayItem = null; + private List arrayItem; public TypeHolderExample() { } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java index 78ada109ce7..e23a10154fc 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray; public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray; public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray; public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray; public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray; public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray; public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray; public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray; public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray; public XmlItem() { } @@ -263,9 +263,6 @@ public class XmlItem { } public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { - if (this.wrappedArray == null) { - this.wrappedArray = null; - } this.wrappedArray.add(wrappedArrayItem); return this; } @@ -401,9 +398,6 @@ public class XmlItem { } public XmlItem addNameArrayItem(Integer nameArrayItem) { - if (this.nameArray == null) { - this.nameArray = null; - } this.nameArray.add(nameArrayItem); return this; } @@ -435,9 +429,6 @@ public class XmlItem { } public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { - if (this.nameWrappedArray == null) { - this.nameWrappedArray = null; - } this.nameWrappedArray.add(nameWrappedArrayItem); return this; } @@ -573,9 +564,6 @@ public class XmlItem { } public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { - if (this.prefixArray == null) { - this.prefixArray = null; - } this.prefixArray.add(prefixArrayItem); return this; } @@ -607,9 +595,6 @@ public class XmlItem { } public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { - if (this.prefixWrappedArray == null) { - this.prefixWrappedArray = null; - } this.prefixWrappedArray.add(prefixWrappedArrayItem); return this; } @@ -745,9 +730,6 @@ public class XmlItem { } public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { - if (this.namespaceArray == null) { - this.namespaceArray = null; - } this.namespaceArray.add(namespaceArrayItem); return this; } @@ -779,9 +761,6 @@ public class XmlItem { } public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { - if (this.namespaceWrappedArray == null) { - this.namespaceWrappedArray = null; - } this.namespaceWrappedArray.add(namespaceWrappedArrayItem); return this; } @@ -917,9 +896,6 @@ public class XmlItem { } public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { - if (this.prefixNsArray == null) { - this.prefixNsArray = null; - } this.prefixNsArray.add(prefixNsArrayItem); return this; } @@ -951,9 +927,6 @@ public class XmlItem { } public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { - if (this.prefixNsWrappedArray == null) { - this.prefixNsWrappedArray = null; - } this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); return this; } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java index dfd5ef1d18b..2b46ef97b0a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java @@ -305,7 +305,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -431,7 +431,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -477,7 +477,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index f9d1908df76..e21555ed0f0 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -35,10 +35,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty; public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty; public AdditionalPropertiesClass() { } @@ -50,9 +50,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) { - if (this.mapProperty == null) { - this.mapProperty = null; - } this.mapProperty.put(key, mapPropertyItem); return this; } @@ -84,9 +81,6 @@ public class AdditionalPropertiesClass { } public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map mapOfMapPropertyItem) { - if (this.mapOfMapProperty == null) { - this.mapOfMapProperty = null; - } this.mapOfMapProperty.put(key, mapOfMapPropertyItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7729eedac4b..458dcd501b7 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber; public ArrayOfArrayOfNumberOnly() { } @@ -47,9 +47,6 @@ public class ArrayOfArrayOfNumberOnly { } public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = null; - } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 20fa6c02c33..1bf6b6eca33 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber; public ArrayOfNumberOnly() { } @@ -47,9 +47,6 @@ public class ArrayOfNumberOnly { } public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - if (this.arrayNumber == null) { - this.arrayNumber = null; - } this.arrayNumber.add(arrayNumberItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java index fb1542f33ba..6fa67a39efd 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger; public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel; public ArrayTest() { } @@ -55,9 +55,6 @@ public class ArrayTest { } public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - if (this.arrayOfString == null) { - this.arrayOfString = null; - } this.arrayOfString.add(arrayOfStringItem); return this; } @@ -89,9 +86,6 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = null; - } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; } @@ -123,9 +117,6 @@ public class ArrayTest { } public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { - if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = null; - } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java index 46e76d1f743..4e390827d8a 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum; public EnumArrays() { } @@ -146,9 +146,6 @@ public class EnumArrays { } public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - if (this.arrayEnum == null) { - this.arrayEnum = null; - } this.arrayEnum.add(arrayEnumItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 0db455cb632..d6a00997d93 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files; public FileSchemaTestClass() { } @@ -77,9 +77,6 @@ public class FileSchemaTestClass { } public FileSchemaTestClass addFilesItem(ModelFile filesItem) { - if (this.files == null) { - this.files = null; - } this.files.add(filesItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java index 3d6c7ba4f45..dc7486f4194 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString; /** * Gets or Sets inner @@ -75,13 +75,13 @@ public class MapTest { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString; public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap; public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap; public MapTest() { } @@ -93,9 +93,6 @@ public class MapTest { } public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { - if (this.mapMapOfString == null) { - this.mapMapOfString = null; - } this.mapMapOfString.put(key, mapMapOfStringItem); return this; } @@ -127,9 +124,6 @@ public class MapTest { } public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { - if (this.mapOfEnumString == null) { - this.mapOfEnumString = null; - } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; } @@ -161,9 +155,6 @@ public class MapTest { } public MapTest putDirectMapItem(String key, Boolean directMapItem) { - if (this.directMap == null) { - this.directMap = null; - } this.directMap.put(key, directMapItem); return this; } @@ -195,9 +186,6 @@ public class MapTest { } public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { - if (this.indirectMap == null) { - this.indirectMap = null; - } this.indirectMap.put(key, indirectMapItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 340223cd136..e7f63f4af67 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map; public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -109,9 +109,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - if (this.map == null) { - this.map = null; - } this.map.put(key, mapItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java index 39f24d625a2..15eb983d5f2 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -78,7 +78,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable; public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable; public NullableClass() { @@ -305,7 +305,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -396,9 +396,6 @@ public class NullableClass extends HashMap { } public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) { - if (this.arrayItemsNullable == null) { - this.arrayItemsNullable = null; - } this.arrayItemsNullable.add(arrayItemsNullableItem); return this; } @@ -431,7 +428,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -477,7 +474,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); @@ -522,9 +519,6 @@ public class NullableClass extends HashMap { } public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNullableItem) { - if (this.objectItemsNullable == null) { - this.objectItemsNullable = null; - } this.objectItemsNullable.put(key, objectItemsNullableItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 1d9eb6b07cf..07c8d009d4f 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars; public ObjectWithDeprecatedFields() { } @@ -142,9 +142,6 @@ public class ObjectWithDeprecatedFields { } public ObjectWithDeprecatedFields addBarsItem(String barsItem) { - if (this.bars == null) { - this.bars = null; - } this.bars.add(barsItem); return this; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java index 6c5498646bc..beca2d006a6 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java @@ -53,10 +53,10 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private Set photoUrls = null; + private Set photoUrls; public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags; /** * pet status in the store @@ -218,9 +218,6 @@ public class Pet { } public Pet addTagsItem(Tag tagsItem) { - if (this.tags == null) { - this.tags = null; - } this.tags.add(tagsItem); return this; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java index ce5080144ea..866bfced4c7 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index beba6c6da0b..ea2ddc6b71b 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -48,10 +48,10 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private JsonNullable anytype1 = JsonNullable.of(null); @@ -63,13 +63,13 @@ public class AdditionalPropertiesClass { private Object mapWithUndeclaredPropertiesAnytype2; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3 = "map_with_undeclared_properties_anytype_3"; - private Map mapWithUndeclaredPropertiesAnytype3 = null; + private Map mapWithUndeclaredPropertiesAnytype3 = new HashMap<>(); public static final String JSON_PROPERTY_EMPTY_MAP = "empty_map"; private Object emptyMap; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING = "map_with_undeclared_properties_string"; - private Map mapWithUndeclaredPropertiesString = null; + private Map mapWithUndeclaredPropertiesString = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 64bbd05c05a..a4940ec1ec6 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 625a68340d3..a2679d903aa 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java index 30ba0b5ec1f..337c357f30e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java index 92249d27c91..f344f11ad05 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java @@ -61,7 +61,7 @@ public class Drawing { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = null; + private List shapes = new ArrayList<>(); public Drawing() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java index ded5072fea3..618d07b460a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public class EnumArrays { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index d69d7dde108..fa760cf7ab3 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java index 64411d7e5ae..8f74fc51ee6 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java @@ -40,7 +40,7 @@ import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -78,13 +78,13 @@ public class MapTest { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e7bdc28485e..402c5b5e3b9 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java index e2c21ac252c..7415b8ed01f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java @@ -85,7 +85,7 @@ public class NullableClass { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -94,7 +94,7 @@ public class NullableClass { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } @@ -304,7 +304,7 @@ public class NullableClass { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(null); + this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -349,7 +349,7 @@ public class NullableClass { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(null); + this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -427,7 +427,7 @@ public class NullableClass { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(null); + this.objectNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -472,7 +472,7 @@ public class NullableClass { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(null); + this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 46b4df3eab7..4b597849b86 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java index dcdc69cb197..b54202ff81f 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java index 54650f48eef..59ce4a39d4f 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java @@ -19,11 +19,11 @@ public class NullableClass extends HashMap { private String stringProp; private LocalDate dateProp; private OffsetDateTime datetimeProp; - private List arrayNullableProp = null; - private List arrayAndItemsNullableProp = null; + private List arrayNullableProp; + private List arrayAndItemsNullableProp; private List arrayItemsNullable = new ArrayList<>(); - private Map objectNullableProp = null; - private Map objectAndItemsNullableProp = null; + private Map objectNullableProp; + private Map objectAndItemsNullableProp; private Map objectItemsNullable = new HashMap<>(); /** diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java index 4952a77745a..17d06d2f2bf 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java @@ -36,7 +36,7 @@ public class Pet { @ApiModelProperty(value = "") @Valid - private List tags = null; + private List tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java index b28067af7f1..8dc256b2c0e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Category.java @@ -21,7 +21,6 @@ public class Category { private String name; - /** **/ public Category id(Long id) { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java index 63a57fee26d..697741620fd 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -24,7 +24,6 @@ public class ModelApiResponse { private String message; - /** **/ public ModelApiResponse code(Integer code) { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java index 9cc76d30df3..37bd6dcf349 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java @@ -60,7 +60,6 @@ public enum StatusEnum { private Boolean complete = false; - /** **/ public Order id(Long id) { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java index ba6f130341e..f67832b43e2 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); - private List tags = null; + private List tags = new ArrayList<>(); public enum StatusEnum { @@ -64,7 +64,6 @@ public enum StatusEnum { private StatusEnum status; - /** **/ public Pet id(Long id) { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java index 8e26cf31ee7..d5c0ffcc135 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Tag.java @@ -21,7 +21,6 @@ public class Tag { private String name; - /** **/ public Tag id(Long id) { diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java index 747e04e3638..2c527c2f733 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/User.java @@ -33,7 +33,6 @@ public class User { private Integer userStatus; - /** **/ public User id(Long id) { diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java index 4952a77745a..17d06d2f2bf 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java @@ -36,7 +36,7 @@ public class Pet { @ApiModelProperty(value = "") @Valid - private List tags = null; + private List tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index d734964347e..dc2c9f53514 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -15,33 +15,33 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class AdditionalPropertiesClass { @ApiModelProperty(value = "") - private Map mapString = null; + private Map mapString = new HashMap<>(); @ApiModelProperty(value = "") @Valid - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); @ApiModelProperty(value = "") - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); @ApiModelProperty(value = "") - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); @ApiModelProperty(value = "") @Valid - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); @ApiModelProperty(value = "") @Valid - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); @ApiModelProperty(value = "") @Valid - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); @ApiModelProperty(value = "") @Valid - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); @ApiModelProperty(value = "") private Object anytype1; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index f6b08390974..669dec7ae65 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -15,7 +15,7 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") @Valid - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); /** * Get arrayArrayNumber * @return arrayArrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 9f55bbb9b47..3697fdb4a11 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -15,7 +15,7 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") @Valid - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); /** * Get arrayNumber * @return arrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java index e88454f027d..65894570595 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java @@ -14,15 +14,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayTest { @ApiModelProperty(value = "") - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); @ApiModelProperty(value = "") @Valid - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); @ApiModelProperty(value = "") @Valid - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); /** * Get arrayOfString * @return arrayOfString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java index 9e58f8485af..995ce277af4 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java @@ -82,7 +82,7 @@ FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); } @ApiModelProperty(value = "") - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); /** * Get justSymbol * @return justSymbol diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 9e1eb921221..8c2212241a5 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -19,7 +19,7 @@ public class FileSchemaTestClass { @ApiModelProperty(value = "") @Valid - private List files = null; + private List files = new ArrayList<>(); /** * Get _file * @return _file diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java index b1dedbeb3bd..81de01c1ecb 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java @@ -16,7 +16,7 @@ public class MapTest { @ApiModelProperty(value = "") @Valid - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { @@ -51,13 +51,13 @@ UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); } @ApiModelProperty(value = "") - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); @ApiModelProperty(value = "") - private Map directMap = null; + private Map directMap = new HashMap<>(); @ApiModelProperty(value = "") - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); /** * Get mapMapOfString * @return mapMapOfString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index b64fdb4041e..8e290019422 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,7 +23,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @ApiModelProperty(value = "") @Valid - private Map map = null; + private Map map = new HashMap<>(); /** * Get uuid * @return uuid diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java index 9cbd95c770c..6ad22f12e0a 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java @@ -34,7 +34,7 @@ public class Pet { @ApiModelProperty(value = "") @Valid - private List tags = null; + private List tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java index 817c7e8d6af..25d74468143 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java @@ -27,7 +27,7 @@ public class XmlItem { private Boolean attributeBoolean; @ApiModelProperty(value = "") - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); @ApiModelProperty(example = "string", value = "") private String nameString; @@ -43,10 +43,10 @@ public class XmlItem { private Boolean nameBoolean; @ApiModelProperty(value = "") - private List nameArray = null; + private List nameArray = new ArrayList<>(); @ApiModelProperty(value = "") - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); @ApiModelProperty(example = "string", value = "") private String prefixString; @@ -62,10 +62,10 @@ public class XmlItem { private Boolean prefixBoolean; @ApiModelProperty(value = "") - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); @ApiModelProperty(value = "") - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); @ApiModelProperty(example = "string", value = "") private String namespaceString; @@ -81,10 +81,10 @@ public class XmlItem { private Boolean namespaceBoolean; @ApiModelProperty(value = "") - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); @ApiModelProperty(value = "") - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); @ApiModelProperty(example = "string", value = "") private String prefixNsString; @@ -100,10 +100,10 @@ public class XmlItem { private Boolean prefixNsBoolean; @ApiModelProperty(value = "") - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); @ApiModelProperty(value = "") - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); /** * Get attributeString * @return attributeString diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 356208351cf..46092077c93 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -47,35 +47,35 @@ import javax.validation.Valid; public class AdditionalPropertiesClass implements Serializable { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; @JsonProperty(JSON_PROPERTY_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; @JsonProperty(JSON_PROPERTY_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; @JsonProperty(JSON_PROPERTY_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; @JsonProperty(JSON_PROPERTY_ANYTYPE1) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3b4561c21e2..a4dfad876ea 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -36,7 +36,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly implements Serializable { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 0535bd356ae..0f00999bd0f 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -36,7 +36,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly implements Serializable { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java index 3e274c6bd9c..63100732223 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java @@ -38,15 +38,15 @@ import javax.validation.Valid; public class ArrayTest implements Serializable { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java index f3d2e1c3bbf..0b6abc5653c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java @@ -103,7 +103,7 @@ public class EnumArrays implements Serializable { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 8151ef2c086..198d7fcd555 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -41,7 +41,7 @@ public class FileSchemaTestClass implements Serializable { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java index a44e7d1cb13..4ecfd580bfb 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java @@ -39,7 +39,7 @@ import javax.validation.Valid; public class MapTest implements Serializable { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -74,15 +74,15 @@ public class MapTest implements Serializable { public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; @JsonProperty(JSON_PROPERTY_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1ff99c6c52b..937cf25dcdd 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java index d71a5546106..21b03a8da57 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java @@ -62,7 +62,7 @@ public class Pet implements Serializable { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java index db63c1246e6..c8e846fa69c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java @@ -80,7 +80,7 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -100,11 +100,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -124,11 +124,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -148,11 +148,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -172,11 +172,11 @@ public class XmlItem implements Serializable { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 11e17272e52..a081869eb28 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -35,11 +35,11 @@ import javax.validation.Valid; public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; @JsonProperty(JSON_PROPERTY_MAP_PROPERTY) - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY) - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public AdditionalPropertiesClass mapProperty(Map mapProperty) { this.mapProperty = mapProperty; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c7122c5c265..982c0e87703 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d8670fadb5d..c33312433c5 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java index fcbf32b30ea..3381f49a5c5 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java index 62743132023..5238609546f 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 352c2b49fd6..5a3eec069e8 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java index 6fed8dd9102..6645c517504 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java @@ -38,7 +38,7 @@ import javax.validation.Valid; public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -73,15 +73,15 @@ public class MapTest { public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; @JsonProperty(JSON_PROPERTY_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0017615bee8..cc739934548 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java index d6cbf2beba7..bc77e28037b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java @@ -73,27 +73,27 @@ public class NullableClass extends HashMap { public static final String JSON_PROPERTY_ARRAY_NULLABLE_PROP = "array_nullable_prop"; @JsonProperty(JSON_PROPERTY_ARRAY_NULLABLE_PROP) - private List arrayNullableProp = null; + private List arrayNullableProp; public static final String JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP = "array_and_items_nullable_prop"; @JsonProperty(JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP) - private List arrayAndItemsNullableProp = null; + private List arrayAndItemsNullableProp; public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE) - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP) - private Map objectNullableProp = null; + private Map objectNullableProp; public static final String JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP = "object_and_items_nullable_prop"; @JsonProperty(JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP) - private Map objectAndItemsNullableProp = null; + private Map objectAndItemsNullableProp; public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE) - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass integerProp(Integer integerProp) { this.integerProp = integerProp; @@ -222,7 +222,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null) { - this.arrayNullableProp = null; + this.arrayNullableProp = new ArrayList<>(); } this.arrayNullableProp.add(arrayNullablePropItem); return this; @@ -250,7 +250,7 @@ public class NullableClass extends HashMap { public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null) { - this.arrayAndItemsNullableProp = null; + this.arrayAndItemsNullableProp = new ArrayList<>(); } this.arrayAndItemsNullableProp.add(arrayAndItemsNullablePropItem); return this; @@ -306,7 +306,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null) { - this.objectNullableProp = null; + this.objectNullableProp = new HashMap<>(); } this.objectNullableProp.put(key, objectNullablePropItem); return this; @@ -334,7 +334,7 @@ public class NullableClass extends HashMap { public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null) { - this.objectAndItemsNullableProp = null; + this.objectAndItemsNullableProp = new HashMap<>(); } this.objectAndItemsNullableProp.put(key, objectAndItemsNullablePropItem); return this; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 0e501e421b9..001ace864cc 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { public static final String JSON_PROPERTY_BARS = "bars"; @JsonProperty(JSON_PROPERTY_BARS) - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields uuid(String uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java index d1f217671cc..70f15b649a2 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 31b4b91dfb2..93e1d2fabdd 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapString = null; - private @Valid Map mapNumber = null; - private @Valid Map mapInteger = null; - private @Valid Map mapBoolean = null; - private @Valid Map> mapArrayInteger = null; - private @Valid Map> mapArrayAnytype = null; - private @Valid Map> mapMapString = null; - private @Valid Map> mapMapAnytype = null; + private @Valid Map mapString = new HashMap<>(); + private @Valid Map mapNumber = new HashMap<>(); + private @Valid Map mapInteger = new HashMap<>(); + private @Valid Map mapBoolean = new HashMap<>(); + private @Valid Map> mapArrayInteger = new HashMap<>(); + private @Valid Map> mapArrayAnytype = new HashMap<>(); + private @Valid Map> mapMapString = new HashMap<>(); + private @Valid Map> mapMapAnytype = new HashMap<>(); private @Valid Object anytype1; private @Valid Object anytype2; private @Valid Object anytype3; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 0385c5e8290..dd5644f5d6f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = null; + private @Valid List> arrayArrayNumber = new ArrayList<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index cbfdb520031..fe540ffc356 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = null; + private @Valid List arrayNumber = new ArrayList<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java index b2043ee09c7..af4c73dc1fe 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = null; - private @Valid List> arrayArrayOfInteger = null; - private @Valid List> arrayArrayOfModel = null; + private @Valid List arrayOfString = new ArrayList<>(); + private @Valid List> arrayArrayOfInteger = new ArrayList<>(); + private @Valid List> arrayArrayOfModel = new ArrayList<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java index 4b2ef0c1c60..dd5505d4346 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java @@ -115,7 +115,7 @@ public class EnumArrays implements Serializable { } } - private @Valid List arrayEnum = null; + private @Valid List arrayEnum = new ArrayList<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 8297178d42f..9f798356573 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { private @Valid ModelFile _file; - private @Valid List files = null; + private @Valid List files = new ArrayList<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java index c45ee600ca2..f45569a171d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = null; + private @Valid Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -68,9 +68,9 @@ public class MapTest implements Serializable { } } - private @Valid Map mapOfEnumString = null; - private @Valid Map directMap = null; - private @Valid Map indirectMap = null; + private @Valid Map mapOfEnumString = new HashMap<>(); + private @Valid Map directMap = new HashMap<>(); + private @Valid Map indirectMap = new HashMap<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index c5e37deb239..01d4be09cbf 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private @Valid UUID uuid; private @Valid Date dateTime; - private @Valid Map map = null; + private @Valid Map map = new HashMap<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index 509dc7f912f..9b3d5c1f46e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet implements Serializable { private @Valid Category category; private @Valid String name; private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List tags = null; + private @Valid List tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java index eff4ff035ff..f7b76bfe002 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/XmlItem.java @@ -25,31 +25,31 @@ public class XmlItem implements Serializable { private @Valid BigDecimal attributeNumber; private @Valid Integer attributeInteger; private @Valid Boolean attributeBoolean; - private @Valid List wrappedArray = null; + private @Valid List wrappedArray = new ArrayList<>(); private @Valid String nameString; private @Valid BigDecimal nameNumber; private @Valid Integer nameInteger; private @Valid Boolean nameBoolean; - private @Valid List nameArray = null; - private @Valid List nameWrappedArray = null; + private @Valid List nameArray = new ArrayList<>(); + private @Valid List nameWrappedArray = new ArrayList<>(); private @Valid String prefixString; private @Valid BigDecimal prefixNumber; private @Valid Integer prefixInteger; private @Valid Boolean prefixBoolean; - private @Valid List prefixArray = null; - private @Valid List prefixWrappedArray = null; + private @Valid List prefixArray = new ArrayList<>(); + private @Valid List prefixWrappedArray = new ArrayList<>(); private @Valid String namespaceString; private @Valid BigDecimal namespaceNumber; private @Valid Integer namespaceInteger; private @Valid Boolean namespaceBoolean; - private @Valid List namespaceArray = null; - private @Valid List namespaceWrappedArray = null; + private @Valid List namespaceArray = new ArrayList<>(); + private @Valid List namespaceWrappedArray = new ArrayList<>(); private @Valid String prefixNsString; private @Valid BigDecimal prefixNsNumber; private @Valid Integer prefixNsInteger; private @Valid Boolean prefixNsBoolean; - private @Valid List prefixNsArray = null; - private @Valid List prefixNsWrappedArray = null; + private @Valid List prefixNsArray = new ArrayList<>(); + private @Valid List prefixNsWrappedArray = new ArrayList<>(); /** **/ diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 753265e81ee..b4e59b23beb 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapString = null; - private @Valid Map mapNumber = null; - private @Valid Map mapInteger = null; - private @Valid Map mapBoolean = null; - private @Valid Map> mapArrayInteger = null; - private @Valid Map> mapArrayAnytype = null; - private @Valid Map> mapMapString = null; - private @Valid Map> mapMapAnytype = null; + private @Valid Map mapString = new HashMap<>(); + private @Valid Map mapNumber = new HashMap<>(); + private @Valid Map mapInteger = new HashMap<>(); + private @Valid Map mapBoolean = new HashMap<>(); + private @Valid Map> mapArrayInteger = new HashMap<>(); + private @Valid Map> mapArrayAnytype = new HashMap<>(); + private @Valid Map> mapMapString = new HashMap<>(); + private @Valid Map> mapMapAnytype = new HashMap<>(); private @Valid Object anytype1; private @Valid Object anytype2; private @Valid Object anytype3; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 1f47464d3c5..d1ebd9ba958 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = null; + private @Valid List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index bab3b727057..07ada528789 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = null; + private @Valid List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java index 6ff8393ed09..fb914088e17 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = null; - private @Valid List> arrayArrayOfInteger = null; - private @Valid List> arrayArrayOfModel = null; + private @Valid List arrayOfString = new ArrayList<>(); + private @Valid List> arrayArrayOfInteger = new ArrayList<>(); + private @Valid List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java index 73891aaba0c..efbb6a6ec55 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java @@ -115,7 +115,7 @@ public class EnumArrays implements Serializable { } } - private @Valid List arrayEnum = null; + private @Valid List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 0a79adf7844..369e7f90999 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class FileSchemaTestClass implements Serializable { private @Valid ModelFile _file; - private @Valid List files = null; + private @Valid List files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java index d857d3073c0..a2aa7420211 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = null; + private @Valid Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -68,9 +68,9 @@ public class MapTest implements Serializable { } } - private @Valid Map mapOfEnumString = null; - private @Valid Map directMap = null; - private @Valid Map indirectMap = null; + private @Valid Map mapOfEnumString = new HashMap<>(); + private @Valid Map directMap = new HashMap<>(); + private @Valid Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 3237d6059a2..9412491c8bd 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private @Valid UUID uuid; private @Valid Date dateTime; - private @Valid Map map = null; + private @Valid Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java index c91f0b0ac94..f9284740e0e 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java @@ -29,7 +29,7 @@ public class Pet implements Serializable { private @Valid Category category; private @Valid String name; private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List tags = null; + private @Valid List tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java index a3c4378d809..9f4eb028354 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/XmlItem.java @@ -25,31 +25,31 @@ public class XmlItem implements Serializable { private @Valid BigDecimal attributeNumber; private @Valid Integer attributeInteger; private @Valid Boolean attributeBoolean; - private @Valid List wrappedArray = null; + private @Valid List wrappedArray = new ArrayList<>(); private @Valid String nameString; private @Valid BigDecimal nameNumber; private @Valid Integer nameInteger; private @Valid Boolean nameBoolean; - private @Valid List nameArray = null; - private @Valid List nameWrappedArray = null; + private @Valid List nameArray = new ArrayList<>(); + private @Valid List nameWrappedArray = new ArrayList<>(); private @Valid String prefixString; private @Valid BigDecimal prefixNumber; private @Valid Integer prefixInteger; private @Valid Boolean prefixBoolean; - private @Valid List prefixArray = null; - private @Valid List prefixWrappedArray = null; + private @Valid List prefixArray = new ArrayList<>(); + private @Valid List prefixWrappedArray = new ArrayList<>(); private @Valid String namespaceString; private @Valid BigDecimal namespaceNumber; private @Valid Integer namespaceInteger; private @Valid Boolean namespaceBoolean; - private @Valid List namespaceArray = null; - private @Valid List namespaceWrappedArray = null; + private @Valid List namespaceArray = new ArrayList<>(); + private @Valid List namespaceWrappedArray = new ArrayList<>(); private @Valid String prefixNsString; private @Valid BigDecimal prefixNsNumber; private @Valid Integer prefixNsInteger; private @Valid Boolean prefixNsBoolean; - private @Valid List prefixNsArray = null; - private @Valid List prefixNsWrappedArray = null; + private @Valid List prefixNsArray = new ArrayList<>(); + private @Valid List prefixNsWrappedArray = new ArrayList<>(); protected XmlItem(XmlItemBuilder b) { this.attributeString = b.attributeString; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index c9a27552219..183ee49cf31 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -46,35 +46,35 @@ import javax.validation.Valid; public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; @JsonProperty(JSON_PROPERTY_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; @JsonProperty(JSON_PROPERTY_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; @JsonProperty(JSON_PROPERTY_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; @JsonProperty(JSON_PROPERTY_ANYTYPE1) diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c7122c5c265..982c0e87703 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d8670fadb5d..c33312433c5 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 31c73b77576..229eaec7c02 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java index 62743132023..5238609546f 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 352c2b49fd6..5a3eec069e8 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java index 6fed8dd9102..6645c517504 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java @@ -38,7 +38,7 @@ import javax.validation.Valid; public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -73,15 +73,15 @@ public class MapTest { public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; @JsonProperty(JSON_PROPERTY_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0017615bee8..cc739934548 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java index d1f217671cc..70f15b649a2 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java index cd07560ac56..5bee8225535 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index c9a27552219..183ee49cf31 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -46,35 +46,35 @@ import javax.validation.Valid; public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; @JsonProperty(JSON_PROPERTY_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; @JsonProperty(JSON_PROPERTY_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; @JsonProperty(JSON_PROPERTY_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; @JsonProperty(JSON_PROPERTY_ANYTYPE1) diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c7122c5c265..982c0e87703 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d8670fadb5d..c33312433c5 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java index 31c73b77576..229eaec7c02 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java index 62743132023..5238609546f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 352c2b49fd6..5a3eec069e8 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java index 6fed8dd9102..6645c517504 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java @@ -38,7 +38,7 @@ import javax.validation.Valid; public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -73,15 +73,15 @@ public class MapTest { public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; @JsonProperty(JSON_PROPERTY_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0017615bee8..cc739934548 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java index d1f217671cc..70f15b649a2 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java index cd07560ac56..5bee8225535 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index c9a27552219..183ee49cf31 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -46,35 +46,35 @@ import javax.validation.Valid; public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; @JsonProperty(JSON_PROPERTY_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; @JsonProperty(JSON_PROPERTY_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; @JsonProperty(JSON_PROPERTY_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; @JsonProperty(JSON_PROPERTY_ANYTYPE1) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c7122c5c265..982c0e87703 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d8670fadb5d..c33312433c5 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 31c73b77576..229eaec7c02 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java index 62743132023..5238609546f 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 352c2b49fd6..5a3eec069e8 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java index 6fed8dd9102..6645c517504 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java @@ -38,7 +38,7 @@ import javax.validation.Valid; public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -73,15 +73,15 @@ public class MapTest { public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; @JsonProperty(JSON_PROPERTY_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0017615bee8..cc739934548 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java index d1f217671cc..70f15b649a2 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java index cd07560ac56..5bee8225535 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = attributeString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index c9a27552219..183ee49cf31 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -46,35 +46,35 @@ import javax.validation.Valid; public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; @JsonProperty(JSON_PROPERTY_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; @JsonProperty(JSON_PROPERTY_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; @JsonProperty(JSON_PROPERTY_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; @JsonProperty(JSON_PROPERTY_ANYTYPE1) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index c7122c5c265..982c0e87703 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d8670fadb5d..c33312433c5 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ import javax.validation.Valid; public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly arrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java index 31c73b77576..229eaec7c02 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java @@ -37,15 +37,15 @@ import javax.validation.Valid; public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest arrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java index 62743132023..5238609546f 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java @@ -102,7 +102,7 @@ public class EnumArrays { public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays justSymbol(JustSymbolEnum justSymbol) { this.justSymbol = justSymbol; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 352c2b49fd6..5a3eec069e8 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILES = "files"; @JsonProperty(JSON_PROPERTY_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass _file(ModelFile _file) { this._file = _file; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java index 6fed8dd9102..6645c517504 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java @@ -38,7 +38,7 @@ import javax.validation.Valid; public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -73,15 +73,15 @@ public class MapTest { public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; @JsonProperty(JSON_PROPERTY_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest mapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0017615bee8..cc739934548 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java index d1f217671cc..70f15b649a2 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java @@ -61,7 +61,7 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java index cd07560ac56..5bee8225535 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java @@ -79,7 +79,7 @@ public class XmlItem { public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @JsonProperty(JSON_PROPERTY_NAME_STRING) @@ -99,11 +99,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; @JsonProperty(JSON_PROPERTY_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @@ -123,11 +123,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @@ -147,11 +147,11 @@ public class XmlItem { public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @@ -171,11 +171,11 @@ public class XmlItem { public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem attributeString(String attributeString) { this.attributeString = 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 3c83acd48f6..06109fa9bea 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 @@ -62,7 +62,7 @@ public class ObjectWithUniqueItems { public ObjectWithUniqueItems addNullSetItem(String nullSetItem) { if (this.nullSet == null || !this.nullSet.isPresent()) { - this.nullSet = JsonNullable.of(null); + this.nullSet = JsonNullable.of(new LinkedHashSet<>()); } this.nullSet.get().add(nullSetItem); return this; @@ -117,7 +117,7 @@ public class ObjectWithUniqueItems { public ObjectWithUniqueItems addNullListItem(String nullListItem) { if (this.nullList == null || !this.nullList.isPresent()) { - this.nullList = JsonNullable.of(null); + this.nullList = JsonNullable.of(new ArrayList<>()); } this.nullList.get().add(nullListItem); return this;