[java][spring] Process fields of POJOs recursively

modules/openapi-generator/src/main/resources/JavaSpring/beanValidation.mustache

@@ -1 +1 @@
-{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{^openApiNullable}}{{>beanValidationCore}}{{/openApiNullable}}{{#openApiNullable}}{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{/openApiNullable}}{{#useOptional}}{{#openApiNullable}}{{#isContainer}}{{^required}}{{>beanValidationCore}}{{/required}}{{/isContainer}}{{/openApiNullable}}{{#openApiNullable}}{{#required}}{{>beanValidationCore}}{{/required}}{{/openApiNullable}}{{/useOptional}}
+{{#required}}{{^isNullable}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/isNullable}}{{/required}}{{#isModel}}@Valid {{/isModel}}{{>beanValidationCore}}

modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache

@@ -1,24 +1 @@
-{{^isUuid}}{{#pattern}}{{^isByteArray}}@Pattern(regexp = "{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/isByteArray}}{{/pattern}}{{!
-minLength && maxLength set
-}}{{#minLength}}{{#maxLength}}@Size(min = {{minLength}}, max = {{maxLength}}) {{/maxLength}}{{/minLength}}{{!
-minLength set, maxLength not
-}}{{#minLength}}{{^maxLength}}@Size(min = {{minLength}}) {{/maxLength}}{{/minLength}}{{!
-minLength not set, maxLength set
-}}{{^minLength}}{{#maxLength}}@Size(max = {{.}}) {{/maxLength}}{{/minLength}}{{!
-@Size: minItems && maxItems set
-}}{{#minItems}}{{#maxItems}}@Size(min = {{minItems}}, max = {{maxItems}}) {{/maxItems}}{{/minItems}}{{!
-@Size: minItems set, maxItems not
-}}{{#minItems}}{{^maxItems}}@Size(min = {{minItems}}) {{/maxItems}}{{/minItems}}{{!
-@Size: minItems not set && maxItems set
-}}{{^minItems}}{{#maxItems}}@Size(max = {{.}}) {{/maxItems}}{{/minItems}}{{!
-@Email: useBeanValidation
-}}{{#isEmail}}{{#useBeanValidation}}@{{javaxPackage}}.validation.constraints.Email {{/useBeanValidation}}{{!
-@Email: performBeanValidation exclusive
-}}{{^useBeanValidation}}{{#performBeanValidation}}@org.hibernate.validator.constraints.Email {{/performBeanValidation}}{{/useBeanValidation}}{{/isEmail}}{{!
-check for integer or long / all others=decimal type with @Decimal*
-isInteger set
-}}{{#isInteger}}{{#minimum}}@Min({{.}}) {{/minimum}}{{#maximum}}@Max({{.}}) {{/maximum}}{{/isInteger}}{{!
-isLong set
-}}{{#isLong}}{{#minimum}}@Min({{.}}L) {{/minimum}}{{#maximum}}@Max({{.}}L) {{/maximum}}{{/isLong}}{{!
-Not Integer, not Long => we have a decimal value!
-}}{{^isInteger}}{{^isLong}}{{#minimum}}@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}) {{/minimum}}{{#maximum}}@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}) {{/maximum}}{{/isLong}}{{/isInteger}}{{/isUuid}}
+{{^isUuid}}{{^isDate}}{{^isDateTime}}{{#pattern}}{{^isByteArray}}@Pattern(regexp = "{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{{vendorExtensions.x-pattern-message}}}"{{/vendorExtensions.x-pattern-message}}) {{/isByteArray}}{{/pattern}}{{!minLength && maxLength set}}{{#minLength}}{{#maxLength}}@Size(min = {{minLength}}, max = {{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{{vendorExtensions.x-size-message}}}"{{/vendorExtensions.x-size-message}}) {{/maxLength}}{{/minLength}}{{!minLength set, maxLength not}}{{#minLength}}{{^maxLength}}@Size(min = {{minLength}}{{#vendorExtensions.x-size-message}}, message="{{{vendorExtensions.x-size-message}}}"{{/vendorExtensions.x-size-message}}) {{/maxLength}}{{/minLength}}{{!minLength not set, maxLength set}}{{^minLength}}{{#maxLength}}@Size(max = {{.}}{{#vendorExtensions.x-size-message}}, message="{{{vendorExtensions.x-size-message}}}"{{/vendorExtensions.x-size-message}}) {{/maxLength}}{{/minLength}}{{!@Size: minItems && maxItems set}}{{#minItems}}{{#maxItems}}@Size(min = {{minItems}}, max = {{maxItems}}{{#vendorExtensions.x-size-message}}, message="{{{vendorExtensions.x-size-message}}}"{{/vendorExtensions.x-size-message}}) {{/maxItems}}{{/minItems}}{{!@Size: minItems set, maxItems not}}{{#minItems}}{{^maxItems}}@Size(min = {{minItems}}{{#vendorExtensions.x-size-message}}, message="{{{vendorExtensions.x-size-message}}}"{{/vendorExtensions.x-size-message}}) {{/maxItems}}{{/minItems}}{{!@Size: minItems not set && maxItems set}}{{^minItems}}{{#maxItems}}@Size(max = {{.}}{{#vendorExtensions.x-size-message}}, message="{{{vendorExtensions.x-size-message}}}"{{/vendorExtensions.x-size-message}}) {{/maxItems}}{{/minItems}}{{!@Email: useBeanValidation}}{{#isEmail}}{{#useBeanValidation}}@{{javaxPackage}}.validation.constraints.Email {{/useBeanValidation}}{{!@Email: performBeanValidation exclusive}}{{^useBeanValidation}}{{#performBeanValidation}}@org.hibernate.validator.constraints.Email {{/performBeanValidation}}{{/useBeanValidation}}{{/isEmail}}{{!check for integer or long / all others=decimal type with @Decimal*isInteger set}}{{#isInteger}}{{#minimum}}@Min({{.}}{{#vendorExtensions.x-min-message}}, message="{{{vendorExtensions.x-min-message}}}"{{/vendorExtensions.x-min-message}}) {{/minimum}}{{#maximum}}@Max({{.}}{{#vendorExtensions.x-max-message}}, message="{{{vendorExtensions.x-max-message}}}"{{/vendorExtensions.x-max-message}}) {{/maximum}}{{/isInteger}}{{!isLong set}}{{#isLong}}{{#minimum}}@Min({{.}}L{{#vendorExtensions.x-min-message}}, message="{{{vendorExtensions.x-min-message}}}"{{/vendorExtensions.x-min-message}}) {{/minimum}}{{#maximum}}@Max({{.}}L{{#vendorExtensions.x-max-message}}, message="{{{vendorExtensions.x-max-message}}}"{{/vendorExtensions.x-max-message}}) {{/maximum}}{{/isLong}}{{!Not Integer, not Long => we have a decimal value!}}{{^isInteger}}{{^isLong}}{{#minimum}}@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-decimalMin-message}}, message="{{{vendorExtensions.x-decimalMin-message}}}"{{/vendorExtensions.x-decimalMin-message}}) {{/minimum}}{{#maximum}}@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-decimalMax-message}}, message="{{{vendorExtensions.x-decimalMax-message}}}"{{/vendorExtensions.x-decimalMax-message}}) {{/maximum}}{{/isLong}}{{/isInteger}}{{/isDateTime}}{{/isDate}}{{/isUuid}}

modules/openapi-generator/src/main/resources/JavaSpring/nullableDataType.mustache

@@ -1 +1 @@
-{{#openApiNullable}}{{#isNullable}}JsonNullable<{{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional<{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{/openApiNullable}}{{{datatypeWithEnum}}}{{#openApiNullable}}{{#isNullable}}>{{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}>{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{/openApiNullable}}
+{{#openApiNullable}}{{#isNullable}}JsonNullable<{{/isNullable}}{{/openApiNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional<{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{#isContainer}}{{{baseType}}}{{#isArray}}{{#items}}<{{>nullableDataType}}>{{/items}}{{/isArray}}{{#isMap}}{{#items}}<String, {{>nullableDataType}}>{{/items}}{{/isMap}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}>{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{#openApiNullable}}{{#isNullable}}>{{/isNullable}}{{/openApiNullable}}

modules/openapi-generator/src/main/resources/JavaSpring/nullableDataTypeBeanValidation.mustache

@@ -1 +1 @@
-{{#openApiNullable}}{{#isNullable}}{{^isContainer}}JsonNullable<{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{/isContainer}}{{#isContainer}}JsonNullable<{{/isContainer}}{{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional<{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{/openApiNullable}}{{{datatypeWithEnum}}}{{#openApiNullable}}{{#isNullable}}>{{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}>{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{/openApiNullable}}
+{{#openApiNullable}}{{#isNullable}}JsonNullable<{{/isNullable}}{{/openApiNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional<{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{#isContainer}}{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}{{{baseType}}}{{#isArray}}{{#items}}<{{>nullableDataTypeBeanValidation}}>{{/items}}{{/isArray}}{{#isMap}}{{#items}}<String, {{>nullableDataTypeBeanValidation}}>{{/items}}{{/isMap}}{{/isContainer}}{{^isContainer}}{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}{{{datatypeWithEnum}}}{{/isContainer}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}>{{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{#openApiNullable}}{{#isNullable}}>{{/isNullable}}{{/openApiNullable}}

modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache

@@ -69,29 +69,13 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
-  {{#isContainer}}
-  {{#useBeanValidation}}@Valid{{/useBeanValidation}}
-  {{#openApiNullable}}
-  private {{#isNullable}}{{>nullableDataTypeBeanValidation}} {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined();{{/isNullable}}{{^required}}{{^isNullable}}{{>nullableDataTypeBeanValidation}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/isNullable}}{{/required}}{{#required}}{{^isNullable}}{{>nullableDataTypeBeanValidation}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/isNullable}}{{/required}}
-  {{/openApiNullable}}
-  {{^openApiNullable}}
-  private {{>nullableDataType}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
-  {{/openApiNullable}}
-  {{/isContainer}}
-  {{^isContainer}}
   {{#isDate}}
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   {{/isDate}}
   {{#isDateTime}}
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   {{/isDateTime}}
-  {{#openApiNullable}}
-  private {{#isNullable}}{{>nullableDataTypeBeanValidation}} {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined();{{/isNullable}}{{^required}}{{^isNullable}}{{>nullableDataTypeBeanValidation}} {{name}}{{#useOptional}} = Optional.{{^defaultValue}}empty(){{/defaultValue}}{{#defaultValue}}of({{{.}}}){{/defaultValue}};{{/useOptional}}{{^useOptional}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/useOptional}}{{/isNullable}}{{/required}}{{^isNullable}}{{#required}}{{>nullableDataTypeBeanValidation}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/required}}{{/isNullable}}
-  {{/openApiNullable}}
-  {{^openApiNullable}}
-  private {{>nullableDataType}} {{name}}{{#isNullable}} = null{{/isNullable}}{{^isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isNullable}};
-  {{/openApiNullable}}
-  {{/isContainer}}
+  private {{>nullableDataTypeBeanValidation}} {{name}}{{#isNullable}}{{#openApiNullable}} = JsonNullable.{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}}{{/openApiNullable}}{{^openApiNullable}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/openApiNullable}}{{/isNullable}}{{^isNullable}}{{#required}}{{!required non-nullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}}{{! optional non-nullable}}{{#useOptional}}{{!with Optional<> wrapper}}{{#isContainer}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isContainer}}{{^isContainer}} = Optional.{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}empty(){{/defaultValue}}{{/isContainer}}{{/useOptional}}{{^useOptional}}{{!without Optional<> wrapper}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/useOptional}}{{/required}}{{/isNullable}};
   {{/vars}}
   {{#vendorExtensions.x-java-no-args-constructor}}
 
@@ -107,18 +91,13 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   /**
    * Constructor with only required parameters{{#generateConstructorWithAllArgs}}{{^vendorExtensions.x-java-all-args-constructor}} and all parameters{{/vendorExtensions.x-java-all-args-constructor}}{{/generateConstructorWithAllArgs}}
    */
-  public {{classname}}({{#requiredVars}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/requiredVars}}) {
+  public {{classname}}({{#requiredVars}}{{>nullableDataType}} {{name}}{{^-last}}, {{/-last}}{{/requiredVars}}) {
     {{#parent}}
     super({{#parentRequiredVars}}{{name}}{{^-last}}, {{/-last}}{{/parentRequiredVars}});
     {{/parent}}
     {{#vars}}
     {{#required}}
-    {{#openApiNullable}}
-    this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.ofNullable({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}};
-    {{/openApiNullable}}
-    {{^openApiNullable}}
     this.{{name}} = {{name}};
-    {{/openApiNullable}}
     {{/required}}
     {{/vars}}
   }
@@ -130,67 +109,41 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   /**
    * Constructor with all args parameters
    */
-  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
-  {{#parent}}
-      super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
-  {{/parent}}
-  {{#vars}}
-  {{#openApiNullable}}
-      this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.ofNullable({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}};
-  {{/openApiNullable}}
-  {{^openApiNullable}}
-      this.{{name}} = {{name}};
-  {{/openApiNullable}}
-  {{/vars}}
+  public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableDataType}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
+    {{#parent}}
+    super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
+    {{/parent}}
+    {{#vars}}
+    this.{{name}} = {{name}};
+    {{/vars}}
   }
   {{/vendorExtensions.x-java-all-args-constructor}}
   {{/lombok.Data}}
   {{#vars}}
   {{^lombok.Data}}
 
   {{! begin feature: fluent setter methods }}
-  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
-    {{#openApiNullable}}
-    this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}};
-    {{/openApiNullable}}
-    {{^openApiNullable}}
+  public {{classname}} {{name}}({{>nullableDataType}} {{name}}) {
     this.{{name}} = {{name}};
-    {{/openApiNullable}}
     return this;
   }
   {{#isArray}}
 
-  public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
-    {{#openApiNullable}}
-    if (this.{{name}} == null{{#isNullable}} || !this.{{name}}.isPresent(){{/isNullable}}) {
-      this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}{{#isNullable}}){{/isNullable}};
-    }
-    this.{{name}}{{#isNullable}}.get(){{/isNullable}}.add({{name}}Item);
-    {{/openApiNullable}}
-    {{^openApiNullable}}
-    if (this.{{name}} == null) {
-      this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}};
+  public {{classname}} add{{nameInPascalCase}}Item({{#items}}{{>nullableDataType}}{{/items}} {{name}}Item) {
+    if (this.{{name}} == null{{#openApiNullable}}{{#isNullable}} || !this.{{name}}.isPresent(){{/isNullable}}{{/openApiNullable}}) {
+      this.{{name}} = {{#openApiNullable}}{{#isNullable}}JsonNullable.of({{/isNullable}}{{/openApiNullable}}{{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}}{{#openApiNullable}}{{#isNullable}}){{/isNullable}}{{/openApiNullable}};
     }
-    this.{{name}}.add({{name}}Item);
-    {{/openApiNullable}}
+    this.{{name}}{{#openApiNullable}}{{#isNullable}}.get(){{/isNullable}}{{/openApiNullable}}.add({{name}}Item);
     return this;
   }
   {{/isArray}}
   {{#isMap}}
 
-  public {{classname}} put{{nameInPascalCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
-    {{#openApiNullable}}
-    if (this.{{name}} == null{{#isNullable}} || !this.{{name}}.isPresent(){{/isNullable}}) {
-      this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}HashMap{{/uniqueItems}}<>(){{/defaultValue}}{{#isNullable}}){{/isNullable}};
+  public {{classname}} put{{nameInPascalCase}}Item(String key, {{#items}}{{>nullableDataType}}{{/items}} {{name}}Item) {
+    if (this.{{name}} == null{{#openApiNullable}}{{#isNullable}} || !this.{{name}}.isPresent(){{/isNullable}}{{/openApiNullable}}) {
+      this.{{name}} = {{#openApiNullable}}{{#isNullable}}JsonNullable.of({{/isNullable}}{{/openApiNullable}}{{{defaultValue}}}{{^defaultValue}}new HashMap<>(){{/defaultValue}}{{#openApiNullable}}{{#isNullable}}){{/isNullable}}{{/openApiNullable}};
     }
-    this.{{name}}{{#isNullable}}.get(){{/isNullable}}.put(key, {{name}}Item);
-    {{/openApiNullable}}
-    {{^openApiNullable}}
-    if (this.{{name}} == null) {
-      this.{{name}} = {{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}HashMap{{/uniqueItems}}<>(){{/defaultValue}};
-    }
-    this.{{name}}.put(key, {{name}}Item);
-    {{/openApiNullable}}
+    this.{{name}}{{#openApiNullable}}{{#isNullable}}.get(){{/isNullable}}{{/openApiNullable}}.put(key, {{name}}Item);
     return this;
   }
   {{/isMap}}
@@ -219,9 +172,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
-  {{#useBeanValidation}}
-  {{>beanValidation}}
-  {{/useBeanValidation}}
   {{^useBeanValidation}}
   {{#required}}@NotNull{{/required}}
   {{/useBeanValidation}}
@@ -279,20 +229,20 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
 
   {{^lombok.Setter}}
   {{! begin feature: fluent setter methods for inherited properties }}
-  public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
+  public {{classname}} {{name}}({{>nullableDataType}} {{name}}) {
     super.{{name}}({{name}});
     return this;
   }
   {{#isArray}}
 
-  public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+  public {{classname}} add{{nameInPascalCase}}Item({{#items}}{{>nullableDataType}}{{/items}} {{name}}Item) {
     super.add{{nameInPascalCase}}Item({{name}}Item);
     return this;
   }
   {{/isArray}}
   {{#isMap}}
 
-  public {{classname}} put{{nameInPascalCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+  public {{classname}} put{{nameInPascalCase}}Item(String key, {{#items}}{{>nullableDataType}}{{/items}} {{name}}Item) {
     super.put{{nameInPascalCase}}Item(key, {{name}}Item);
     return this;
   }
@@ -364,4 +314,4 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{>javaBuilder}}
   {{/generateBuilders}}
   {{/lombok.Data}}
-}
+}